-
Notifications
You must be signed in to change notification settings - Fork 687
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgraded actionbarsherlock sources and fixed some resource conflicts
- Loading branch information
Showing
971 changed files
with
37,008 additions
and
30,863 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| Contributing | ||
| ============ | ||
|
|
||
| If you would like to contribute code to ActionBarSherlock you can do so through | ||
| GitHub by forking the repository and sending a pull request. | ||
|
|
||
| When submitting code, please make every effort to follow existing conventions | ||
| and style in order to keep the code as readable as possible. Please also make | ||
| sure your code compiles by running `mvn clean verify`. Checkstyle failures | ||
| during compilation indicate errors in your style and can be viewed in the | ||
| `checkstyle-result.xml` file. |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE module PUBLIC | ||
| "-//Puppy Crawl//DTD Check Configuration 1.2//EN" | ||
| "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> | ||
|
|
||
| <module name="Checker"> | ||
| <!--module name="NewlineAtEndOfFile"/--> | ||
| <module name="FileLength"/> | ||
| <module name="FileTabCharacter"/> | ||
|
|
||
| <!-- Trailing spaces --> | ||
| <module name="RegexpSingleline"> | ||
| <property name="format" value="\s+$"/> | ||
| <property name="message" value="Line has trailing spaces."/> | ||
| </module> | ||
|
|
||
| <module name="TreeWalker"> | ||
| <property name="cacheFile" value="${checkstyle.cache.file}"/> | ||
|
|
||
| <!-- Checks for Javadoc comments. --> | ||
| <!-- See http://checkstyle.sf.net/config_javadoc.html --> | ||
| <!--module name="JavadocMethod"/--> | ||
| <!--module name="JavadocType"/--> | ||
| <!--module name="JavadocVariable"/--> | ||
| <!--module name="JavadocStyle"/--> | ||
|
|
||
|
|
||
| <!-- Checks for Naming Conventions. --> | ||
| <!-- See http://checkstyle.sf.net/config_naming.html --> | ||
| <!--module name="ConstantName"/--> | ||
| <!--module name="LocalFinalVariableName"/--> | ||
| <!--module name="LocalVariableName"/--> | ||
| <module name="MemberName"/> | ||
| <!--module name="MethodName"/--> | ||
| <module name="PackageName"/> | ||
| <!--module name="ParameterName"/--> | ||
| <!--module name="StaticVariableName"/--> | ||
| <!--module name="TypeName"/--> | ||
|
|
||
|
|
||
| <!-- Checks for imports --> | ||
| <!-- See http://checkstyle.sf.net/config_import.html --> | ||
| <module name="AvoidStarImport"/> | ||
| <module name="IllegalImport"/> <!-- defaults to sun.* packages --> | ||
| <module name="RedundantImport"/> | ||
| <module name="UnusedImports"/> | ||
|
|
||
|
|
||
| <!-- Checks for Size Violations. --> | ||
| <!-- See http://checkstyle.sf.net/config_sizes.html --> | ||
| <!--module name="LineLength"/--> | ||
| <!--module name="MethodLength"/--> | ||
| <!--module name="ParameterNumber"/--> | ||
|
|
||
|
|
||
| <!-- Checks for whitespace --> | ||
| <!-- See http://checkstyle.sf.net/config_whitespace.html --> | ||
| <!--module name="EmptyForIteratorPad"/--> | ||
| <!--module name="MethodParamPad"/--> | ||
| <!--module name="NoWhitespaceAfter"/--> | ||
| <!--module name="NoWhitespaceBefore"/--> | ||
| <!--module name="OperatorWrap"/--> | ||
| <!--module name="ParenPad"/--> | ||
| <!--module name="TypecastParenPad"/--> | ||
| <!--module name="WhitespaceAfter"/--> | ||
| <!--module name="WhitespaceAround"/--> | ||
|
|
||
|
|
||
| <!-- Modifier Checks --> | ||
| <!-- See http://checkstyle.sf.net/config_modifiers.html --> | ||
| <!--module name="ModifierOrder"/--> | ||
| <!--module name="RedundantModifier"/--> | ||
|
|
||
|
|
||
| <!-- Checks for blocks. You know, those {}'s --> | ||
| <!-- See http://checkstyle.sf.net/config_blocks.html --> | ||
| <!--module name="AvoidNestedBlocks"/--> | ||
| <!--module name="EmptyBlock"/--> | ||
| <!--module name="LeftCurly"/--> | ||
| <!--module name="NeedBraces"/--> | ||
| <!--module name="RightCurly"/--> | ||
|
|
||
|
|
||
| <!-- Checks for common coding problems --> | ||
| <!-- See http://checkstyle.sf.net/config_coding.html --> | ||
| <!--module name="AvoidInlineConditionals"/--> | ||
| <module name="DoubleCheckedLocking"/> | ||
| <!--module name="EmptyStatement"/--> | ||
| <!--module name="EqualsHashCode"/--> | ||
| <!--module name="HiddenField"/--> | ||
| <!--module name="IllegalInstantiation"/--> | ||
| <!--module name="InnerAssignment"/--> | ||
| <!--module name="MagicNumber"/--> | ||
| <!--module name="MissingSwitchDefault"/--> | ||
| <module name="RedundantThrows"/> | ||
| <!--module name="SimplifyBooleanExpression"/--> | ||
| <!--module name="SimplifyBooleanReturn"/--> | ||
| <module name="StringLiteralEquality"/> | ||
| <module name="CovariantEquals"/> | ||
| <!--module name="NoClone"/--> | ||
| <module name="NoFinalizer"/> | ||
| <module name="PackageDeclaration"/> | ||
| <!--module name="FallThrough"/--> | ||
|
|
||
| <!-- Checks for class design --> | ||
| <!-- See http://checkstyle.sf.net/config_design.html --> | ||
| <!--module name="DesignForExtension"/--> | ||
| <!--module name="FinalClass"/--> | ||
| <!--module name="HideUtilityClassConstructor"/--> | ||
| <!--module name="InterfaceIsType"/--> | ||
| <!--module name="VisibilityModifier"/--> | ||
|
|
||
|
|
||
| <!-- Miscellaneous other checks. --> | ||
| <!-- See http://checkstyle.sf.net/config_misc.html --> | ||
| <!--module name="ArrayTypeStyle"/--> | ||
| <!--module name="FinalParameters"/--> | ||
| <!--module name="TodoComment"/--> | ||
| <module name="UpperEll"/> | ||
| </module> | ||
| </module> |
11 changes: 2 additions & 9 deletions
11
actionbarsherlock/library/AndroidManifest.xml
100644 → 100755
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock"> | ||
|
|
||
| <manifest | ||
| xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.actionbarsherlock" | ||
| android:versionCode="50" | ||
| android:versionName="3.5.0"> | ||
|
|
||
| <uses-sdk | ||
| android:minSdkVersion="4" | ||
| android:targetSdkVersion="13" /> | ||
| <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/> | ||
|
|
||
| </manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Oops, something went wrong.