Pushing out 2.5.0 android release.

This commit is contained in:
Samuel Clay 2013-07-31 16:33:56 -07:00
parent 2f3a8ab983
commit fec12ecd2d
6 changed files with 21 additions and 9 deletions

View file

@ -2,20 +2,24 @@
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="FacetManager"> <component name="FacetManager">
<facet type="android" name="Android"> <facet type="android" name="Android">
<configuration /> <configuration>
<option name="UPDATE_PROPERTY_FILES" value="true" />
</configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content> </content>
<orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="android-support-v4" level="project" /> <orderEntry type="library" name="android-support-v4" level="project" />
<orderEntry type="library" exported="" name="gson-2.2.3" level="project" /> <orderEntry type="library" name="actionbarsherlock" level="project" />
<orderEntry type="module" module-name="ActionBarSherlock" exported="" /> <orderEntry type="library" name="gson-2.2.3" level="project" />
<orderEntry type="library" name="classes" level="project" />
<orderEntry type="module" module-name="ActionBarSherlock" />
</component> </component>
</module> </module>

View file

@ -53,6 +53,14 @@ blockquote {
margin: 20px 0; margin: 20px 0;
} }
pre {
width: 100%;
}
pre, code {
overflow: auto;
}
ins { ins {
text-decoration: none; text-decoration: none;
} }

View file

@ -4,6 +4,7 @@
<facet type="android" name="Android"> <facet type="android" name="Android">
<configuration> <configuration>
<option name="LIBRARY_PROJECT" value="true" /> <option name="LIBRARY_PROJECT" value="true" />
<option name="UPDATE_PROPERTY_FILES" value="true" />
</configuration> </configuration>
</facet> </facet>
</component> </component>
@ -12,7 +13,6 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content> </content>
<orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android 4.2.2" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />

View file

@ -9,4 +9,4 @@
android.library=true android.library=true
# Project target. # Project target.
target=android-14 target=android-17

View file

@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target. # Project target.
target=android-14 target=android-17
android.library.reference.1=libs/ActionBarSherlock android.library.reference.1=libs/ActionBarSherlock

View file

@ -59,7 +59,7 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_below="@id/item_feed_border" android:layout_below="@id/item_feed_border"
android:textColor="@color/story_title_unread" android:textColor="@color/story_title_unread"
android:textSize="16sp" /> android:textSize="17sp" />
<TextView <TextView
android:id="@+id/reading_item_date" android:id="@+id/reading_item_date"