Merge branch 'prerelease'

Author: developernotes

AndroidManifest.xml

@@ -10,6 +10,9 @@
             </intent-filter>
         </activity>
         <provider android:name=".ZeteticContentProvider" android:authorities="net.zetetic.sqlcipher.zeteticprovider" />
+
+        <provider android:name=".ZeteticContentProvider2" android:authorities="net.zetetic.sqlcipher.zeteticprovider2"
+            android:process=":provider" />
     </application>
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 </manifest>

README.org

@@ -1,3 +1,3 @@
 To run, clone this repo and make sure you have the Android SDK installed.
-- Currently support Android OS 2.1 - 4.0.3, simply run on either an emulator or device.
+- Currently support Android OS 2.1 - 4.3, simply run on either an emulator or device.
 - More information can be found at [[http://sqlcipher.net/sqlcipher-for-android/][SQLCipher for Android]].

libs/armeabi/libdatabase_sqlcipher.so

@@ -11,6 +11,7 @@
         <option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
         <includeSystemProguardFile>false</includeSystemProguardFile>
         <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
+        <option name="COMPILE_CUSTOM_GENERATED_SOURCES" value="false" />
         <resOverlayFolders />
       </configuration>
     </facet>
@@ -25,7 +26,6 @@
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
-      <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="jdk" jdkName="Maven Android 2.1 Platform" jdkType="Android SDK" />

libs/armeabi/libsqlcipher_android.so

@@ -196,6 +196,9 @@
       </item>
     </group>
   </component>
+  <component name="ProjectDictionaryState">
+    <dictionary name="nparker" />
+  </component>
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/net.zetetic.sqlcipher.test.iml" filepath="$PROJECT_DIR$/net.zetetic.sqlcipher.test.iml" />

libs/sqlcipher.jar

@@ -20,4 +20,13 @@
               android:singleLine="true"
               android:ellipsize="end"
               android:layout_toLeftOf="@+id/test_status"/>
+    <TextView android:id="@+id/test_message"
+              android:layout_height="wrap_content"
+              android:layout_width="fill_parent"
+              android:gravity="left"
+              android:textSize="14sp"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_below="@+id/test_name"
+              android:layout_toLeftOf="@+id/test_status"/>
 </RelativeLayout>