Skip to content

Commit

Permalink
Merge branch 'abs_upgrade'
Browse files Browse the repository at this point in the history
  • Loading branch information
@a-thomas
a-thomas committed May 2, 2013
2 parents a726f8d + 62b60f5 commit fe92ecb
Show file tree
Hide file tree
Showing 71 changed files with 891 additions and 963 deletions.
24 changes: 24 additions & 0 deletions androidkickstartr-core/src/main/resources/libs/ActionBarSherlock/actionbarsherlock/lint.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<lint>
<issue id="ObsoleteLayoutParam" severity="ignore"/>
<issue id="UnusedResources" severity="ignore"/>
<issue id="NewApi" severity="ignore"/>
<issue id="IconDuplicates" severity="ignore"/>
<issue id="IconDuplicatesConfig" severity="ignore"/>
<issue id="IconDensities" severity="ignore"/>
<issue id="ContentDescription" severity="ignore"/>
<issue id="SelectableText" severity="ignore"/>
<issue id="NestedWeights" severity="ignore"/>
<issue id="InefficientWeight" severity="ignore"/>
<issue id="UselessParent" severity="ignore"/>
<issue id="TypographyEllipsis" severity="ignore"/>
<issue id="InlinedApi" severity="ignore"/>
<issue id="DefaultLocale" severity="ignore"/>
<issue id="WrongCall" severity="ignore"/>
<issue id="DuplicateIds" severity="ignore"/>
<issue id="MissingPrefix" severity="ignore"/>
<issue id="UseCompoundDrawables" severity="ignore"/>
<issue id="Overdraw" severity="ignore"/>
<issue id="Registered" severity="ignore"/>
<issue id="ViewConstructor" severity="ignore"/>
</lint>
257 changes: 123 additions & 134 deletions androidkickstartr-core/src/main/resources/libs/ActionBarSherlock/actionbarsherlock/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,148 +1,137 @@
<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>

<artifactId>actionbarsherlock</artifactId>
<name>ActionBarSherlock</name>
<packaging>apklib</packaging>
<parent>
<groupId>com.actionbarsherlock</groupId>
<artifactId>parent</artifactId>
<version>4.3.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

<parent>
<groupId>com.actionbarsherlock</groupId>
<artifactId>parent</artifactId>
<version>4.2.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>actionbarsherlock</artifactId>
<name>ActionBarSherlock</name>
<packaging>apklib</packaging>

<dependencies>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>
<dependencies>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>android</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.android</groupId>
<artifactId>support-v4</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.robolectric</groupId>
<artifactId>robolectric</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<build>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>

<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<nativeLibrariesDirectory>ignored</nativeLibrariesDirectory>
</configuration>
</plugin>
<plugins>
<plugin>
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
<artifactId>android-maven-plugin</artifactId>
<extensions>true</extensions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>

<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<version>1.4.0</version>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<ignoreMissingFile>false</ignoreMissingFile>
<file>target/generated-sources/r/com/actionbarsherlock/R.java</file>
<outputFile>target/generated-sources/r/com/actionbarsherlock/R.java</outputFile>
<regex>false</regex>
<token>static final int</token>
<value>static int</value>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<executions>
<execution>
<phase>process-sources</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<ignoreMissingFile>false</ignoreMissingFile>
<file>target/generated-sources/r/com/actionbarsherlock/R.java</file>
<outputFile>target/generated-sources/r/com/actionbarsherlock/R.java</outputFile>
<regex>false</regex>
<token>static final int</token>
<value>static int</value>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<configLocation>../checkstyle.xml</configLocation>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>checkstyle</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<type>jar</type>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<type>jar</type>
<file>${project.build.directory}/${project.build.finalName}.jar</file>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>

<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<versionRange>[1.4.0,)</versionRange>
<goals>
<goal>replace</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>maven-replacer-plugin</artifactId>
<versionRange>[1.4.0,)</versionRange>
<goals>
<goal>replace</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
Binary file removed ...arSherlock/actionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png
View file
Binary file not shown.
Binary file removed ...rSherlock/actionbarsherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png
View file
Binary file not shown.
Binary file added ...ock/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ck/actionbarsherlock/res/drawable-hdpi/abs__ic_commit_search_api_holo_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...s/libs/ActionBarSherlock/actionbarsherlock/res/drawable-hdpi/abs__ic_search.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...bs/ActionBarSherlock/actionbarsherlock/res/drawable-hdpi/abs__toast_frame.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...arSherlock/actionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png
View file
Binary file not shown.
Binary file removed ...rSherlock/actionbarsherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png
View file
Binary file not shown.
Binary file added ...ock/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...ck/actionbarsherlock/res/drawable-mdpi/abs__ic_commit_search_api_holo_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...bs/ActionBarSherlock/actionbarsherlock/res/drawable-mdpi/abs__toast_frame.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed ...rSherlock/actionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png
View file
Binary file not shown.
Binary file removed ...Sherlock/actionbarsherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png
View file
Binary file not shown.
Binary file added ...ck/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_dark.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...k/actionbarsherlock/res/drawable-xhdpi/abs__ic_commit_search_api_holo_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...s/ActionBarSherlock/actionbarsherlock/res/drawable-xhdpi/abs__toast_frame.9.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions ...ces/libs/ActionBarSherlock/actionbarsherlock/res/layout-xlarge/abs__screen_action_bar.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ This is an optimized layout for a screen with the Action Bar enabled.
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:fitsSystemWindows="true"
android:splitMotionEvents="false"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<com.actionbarsherlock.internal.widget.ActionBarContainer
Expand Down
3 changes: 2 additions & 1 deletion .../ActionBarSherlock/actionbarsherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ the Action Bar enabled overlaying application content.
-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
android:splitMotionEvents="false">
<com.actionbarsherlock.internal.nineoldandroids.widget.NineFrameLayout android:id="@+id/abs__content"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
Expand Down
4 changes: 2 additions & 2 deletions ...rces/libs/ActionBarSherlock/actionbarsherlock/res/layout/abs__action_bar_tab_bar_view.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>

<com.actionbarsherlock.internal.widget.IcsLinearLayout
<com.actionbarsherlock.internal.widget.TabsLinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="?attr/actionBarTabBarStyle"
/>
/>
46 changes: 0 additions & 46 deletions .../resources/libs/ActionBarSherlock/actionbarsherlock/res/layout/abs__dialog_title_holo.xml
View file

This file was deleted.

Loading

0 comments on commit fe92ecb

Please sign in to comment.