Skip to content

Commit 9786b11

Browse files
sbosleysbosley
committed
Upgraded actionbarsherlock sources and fixed some resource conflicts
1 parent 19545cb commit 9786b11

File tree

971 files changed

+37008
-30863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

971 files changed

+37008
-30863
lines changed

‎actionbarsherlock/CHANGELOG.md

100644100755
+102-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,116 @@
11
Change Log
22
===============================================================================
33

4+
Version 4.2.0 *(2012-10-07)*
5+
----------------------------
6+
7+
**Maven `artifactId` is now to 'actionbarsherlock'.**
8+
9+
Note: The `.Dialog` themes are now deprecated. These will be removed in a future
10+
version of the library.
11+
12+
* Add `SearchView` widget for standard search interaction (API 8+ only)
13+
* Fix: `ShareActionProvider` in the split action bar no longer fills the entire
14+
screen.
15+
* Fix: `ShareActionProvider` now does file I/O on a background thread.
16+
* Fix: Automatically correct `ColorDrawable` not respecting bounds when used as
17+
a stacked background.
18+
* Fix: Ensure fragments collection is present before dispatching events.
19+
* Fix: XML-defined `onClick` searches the correct context for the declared
20+
method.
21+
* Fix: Ensure action mode start/finish callbacks are invoked on the activity
22+
for the native action bar.
23+
* Fix: Allow tab callbacks to have a fragment transaction instance for any
24+
`FragmentActivity`.
25+
* Fix: Ensure `CollapsibleActionView` callbacks are dispatched in both native
26+
and compatbility action bars.
27+
* Fix: Remove `.ForceOverflow` themes. These never should have been included.
28+
29+
30+
Version 4.1.0 *(2012-05-17)*
31+
----------------------------
32+
33+
* Fix: Altered technique used for menu event dispatching through the fragment
34+
manager for greater control.
35+
* Fix: Do not dispatch menu creation event if the activity has been destroyed.
36+
* Fix: Correct potential `NullPointerException` when expanding an action item.
37+
* Fix: Correct potential `NullPointerException` when the hardware menu key was
38+
pressed in an activity that is forcing the overflow menu.
39+
* Fix: Do not set a listener on the native action bar tab wrapper unless a
40+
compatibility listener has been set.
41+
* Fix: Ensure the compatibility animation framework is always available on
42+
views even if they were previously detached from the view hierarchy.
43+
44+
45+
Version 4.0.2 *(2012-04-15)*
46+
----------------------------
47+
48+
* Upgrade to r7 support library.
49+
* Fix: Do not trigger menu creation after `onCreate` if activity is finishing.
50+
* Fix: Prevent overflow from displaying if there are no overflow action items.
51+
* Fix: Long-pressing menu key no longer triggers overflow.
52+
* Fix: Use proper tab state-list drawable to mimic ICS.
53+
* Fix: Ensure dispatching menu creation and preparation to fragments can
54+
properly return `false` when appropriate to avoid rendering artifacts.
55+
* Fix: Properly save and fetch action mode tag on ICS.
56+
* Fix: Add missing density-specific resources for certain asssets and remove
57+
unused assets.
58+
59+
60+
Version 4.0.1 *(2012-03-25)*
61+
----------------------------
62+
63+
* Add `ShareActionProvider` widget for use as action items.
64+
* Re-add 'Styled' sample to provide a more comprehensive theming example.
65+
* Fix: Do not dispatch options item selection to fragments if the activity
66+
handles the callback.
67+
* Fix: Prevent menu key from opening the overflow menu when an action mode is
68+
currently displayed.
69+
* Fix: Ensure fragment transaction instance is not `null` on initial tab
70+
selection callback.
71+
* Fix: Displaying an action mode while using stacked tab navigation no longer
72+
throws an exception.
73+
* Fix: Using expandable action item callbacks no longer results in a possible
74+
exception on older devices.
75+
76+
77+
Version 4.0.0 *(2012-03-07)*
78+
----------------------------
79+
80+
Complete rewrite of the library to backport the Android 4.0 action bar.
81+
82+
* The minimum supported version of Android is now 2.1 (API 7).
83+
* New base activities are provided (e.g., `SherlockActivity` and
84+
`SherlockFragmentActivity`) which extend from the native activities.
85+
* The support library sources are no longer included in the library. You must
86+
include `android-support-v4.jar` in your project separately.
87+
* Theming now mirrors that of the native action bar through the use of multiple
88+
styles rather than through `ab`- and `am`-prefixed attributes in the theme.
89+
* The action bar can be statically attached to an activity view without the
90+
requirement of using one of the provided base activities.
91+
92+
93+
Version 3.5.1 *(2012-01-03)*
94+
----------------------------
95+
96+
* Fix: `NullPointerException` in `FragmentManager` can no longer occur when an
97+
attempt is being made to save to a `Bundle` that has not yet been created.
98+
* Fix: Pre-3.0 action item submenu dialogs now properly dismiss themselves when
99+
an item of theirs is selected.
100+
101+
4102
Version 3.5.0 *(2011-12-18)*
5103
----------------------------
6104

7105
* Library now uses the `r6` version of the compatibility library for its base.
8106
Ice Cream Sandwich-specific implementations are currently disabled, however,
9107
but will be added in a future version of the library.
10-
108+
11109
`MenuCompat`, `MenuItemCompat`, and `ActivityCompat` have be added back in
12110
to ease transition to this library but all their methods and the classes
13111
themselves have been deprecated.
14112
* Rewritten menu and action item support from Ice Cream Sandwich.
15-
113+
16114
* Removed the need for the custom `Window.FEATURE_ACTION_ITEM_TEXT` flag.
17115
You should now use the `showAsAction` attribute and/or the
18116
`setShowAsAction(int)` method on each `MenuItem` to control whether or
@@ -29,7 +127,7 @@ Version 3.5.0 *(2011-12-18)*
29127
* Fix: Invisible sub-menu items are no longer shown on the pre-3.0 popup list.
30128

31129

32-
Version 3.4.2 *(2011-11-09)*
130+
Version 3.4.2 *(2001-11-09)*
33131
----------------------------
34132

35133
* Fix: Stacked action bar now properly sets the tab bar background based on
@@ -103,7 +201,7 @@ Version 3.3.0 *(2011-10-11)*
103201
[StackOverflow](http://stackoverflow.com/questions/5637894/dialogfragments-with-devices-api-level-11/7560686#7560686)
104202
for more information.
105203
* Fix: Popping a fragment off of the back stack now properly assigns its parent
106-
activity.
204+
activity.
107205
* Fix: An activity result no longer causes a `NullPointerException` when the
108206
target fragment no longer exists.
109207
* Fix: Action item dividers are now properly initially hidden when their

‎actionbarsherlock/CONTRIBUTING.md

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Contributing
2+
============
3+
4+
If you would like to contribute code to ActionBarSherlock you can do so through
5+
GitHub by forking the repository and sending a pull request.
6+
7+
When submitting code, please make every effort to follow existing conventions
8+
and style in order to keep the code as readable as possible. Please also make
9+
sure your code compiles by running `mvn clean verify`. Checkstyle failures
10+
during compilation indicate errors in your style and can be viewed in the
11+
`checkstyle-result.xml` file.

‎actionbarsherlock/LICENSE.txt

100644100755
File mode changed.

‎actionbarsherlock/README.md

100644100755
+20-15
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
1-
Action Bar Sherlock
2-
===================
1+
ActionBarSherlock
2+
=================
33

4-
ActionBarSherlock is an extension of the [compatibility library][1] designed
5-
to facilitate the use of the action bar design pattern across all versions of
6-
Android through a single API.
4+
ActionBarSherlock is an standalone library designed to facilitate the use of
5+
the action bar design pattern across all versions of Android through a single
6+
API.
77

88
The library will automatically use the [native ActionBar][2] implementation on
9-
Android 3.0 or later. For previous versions which do not include ActionBar, a
10-
custom action bar implementation will automatically be wrapped around the
11-
layout. Support for this goes all the way back to Android 1.6.
12-
13-
Try out the sample applications on the Android Market: [Feature Demos][4],
14-
[Shakespeare][5], and [Styled Action Bar][6].
9+
Android 4.0 or later. For previous versions which do not include ActionBar, a
10+
custom action bar implementation based on the sources of Ice Cream Sandwich
11+
will automatically be wrapped around the layout. This allows you to easily
12+
develop an application with an action bar for every version of Android from 2.x
13+
and up.
1514

1615
**See http://actionbarsherlock.com for more information.**
1716

1817
![Example Image][3]
1918

19+
Try out the sample applications on the Android Market: [Feature Demos][4],
20+
[Fragments][5], and [RoboGuice][6].
21+
22+
Continuous integration is provided by [Travis CI][7].
23+
2024

2125

2226
Developed By
@@ -29,7 +33,7 @@ Developed By
2933
License
3034
=======
3135

32-
Copyright 2011 Jake Wharton
36+
Copyright 2012 Jake Wharton
3337

3438
Licensed under the Apache License, Version 2.0 (the "License");
3539
you may not use this file except in compliance with the License.
@@ -50,6 +54,7 @@ License
5054
[1]: http://android-developers.blogspot.com/2011/03/fragments-for-all.html
5155
[2]: http://developer.android.com/guide/topics/ui/actionbar.html
5256
[3]: http://actionbarsherlock.com/static/feature.png
53-
[4]: https://market.android.com/details?id=com.actionbarsherlock.sample.demos
54-
[5]: https://market.android.com/details?id=com.actionbarsherlock.sample.shakespeare
55-
[6]: https://market.android.com/details?id=com.actionbarsherlock.sample.styledactionbar
57+
[4]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.demos
58+
[5]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.fragments
59+
[6]: https://play.google.com/store/apps/details?id=com.actionbarsherlock.sample.roboguice
60+
[7]: https://travis-ci.org/JakeWharton/ActionBarSherlock

‎actionbarsherlock/checkstyle.xml

+121
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<?xml version="1.0"?>
2+
<!DOCTYPE module PUBLIC
3+
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4+
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
5+
6+
<module name="Checker">
7+
<!--module name="NewlineAtEndOfFile"/-->
8+
<module name="FileLength"/>
9+
<module name="FileTabCharacter"/>
10+
11+
<!-- Trailing spaces -->
12+
<module name="RegexpSingleline">
13+
<property name="format" value="\s+$"/>
14+
<property name="message" value="Line has trailing spaces."/>
15+
</module>
16+
17+
<module name="TreeWalker">
18+
<property name="cacheFile" value="${checkstyle.cache.file}"/>
19+
20+
<!-- Checks for Javadoc comments. -->
21+
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
22+
<!--module name="JavadocMethod"/-->
23+
<!--module name="JavadocType"/-->
24+
<!--module name="JavadocVariable"/-->
25+
<!--module name="JavadocStyle"/-->
26+
27+
28+
<!-- Checks for Naming Conventions. -->
29+
<!-- See http://checkstyle.sf.net/config_naming.html -->
30+
<!--module name="ConstantName"/-->
31+
<!--module name="LocalFinalVariableName"/-->
32+
<!--module name="LocalVariableName"/-->
33+
<module name="MemberName"/>
34+
<!--module name="MethodName"/-->
35+
<module name="PackageName"/>
36+
<!--module name="ParameterName"/-->
37+
<!--module name="StaticVariableName"/-->
38+
<!--module name="TypeName"/-->
39+
40+
41+
<!-- Checks for imports -->
42+
<!-- See http://checkstyle.sf.net/config_import.html -->
43+
<module name="AvoidStarImport"/>
44+
<module name="IllegalImport"/> <!-- defaults to sun.* packages -->
45+
<module name="RedundantImport"/>
46+
<module name="UnusedImports"/>
47+
48+
49+
<!-- Checks for Size Violations. -->
50+
<!-- See http://checkstyle.sf.net/config_sizes.html -->
51+
<!--module name="LineLength"/-->
52+
<!--module name="MethodLength"/-->
53+
<!--module name="ParameterNumber"/-->
54+
55+
56+
<!-- Checks for whitespace -->
57+
<!-- See http://checkstyle.sf.net/config_whitespace.html -->
58+
<!--module name="EmptyForIteratorPad"/-->
59+
<!--module name="MethodParamPad"/-->
60+
<!--module name="NoWhitespaceAfter"/-->
61+
<!--module name="NoWhitespaceBefore"/-->
62+
<!--module name="OperatorWrap"/-->
63+
<!--module name="ParenPad"/-->
64+
<!--module name="TypecastParenPad"/-->
65+
<!--module name="WhitespaceAfter"/-->
66+
<!--module name="WhitespaceAround"/-->
67+
68+
69+
<!-- Modifier Checks -->
70+
<!-- See http://checkstyle.sf.net/config_modifiers.html -->
71+
<!--module name="ModifierOrder"/-->
72+
<!--module name="RedundantModifier"/-->
73+
74+
75+
<!-- Checks for blocks. You know, those {}'s -->
76+
<!-- See http://checkstyle.sf.net/config_blocks.html -->
77+
<!--module name="AvoidNestedBlocks"/-->
78+
<!--module name="EmptyBlock"/-->
79+
<!--module name="LeftCurly"/-->
80+
<!--module name="NeedBraces"/-->
81+
<!--module name="RightCurly"/-->
82+
83+
84+
<!-- Checks for common coding problems -->
85+
<!-- See http://checkstyle.sf.net/config_coding.html -->
86+
<!--module name="AvoidInlineConditionals"/-->
87+
<module name="DoubleCheckedLocking"/>
88+
<!--module name="EmptyStatement"/-->
89+
<!--module name="EqualsHashCode"/-->
90+
<!--module name="HiddenField"/-->
91+
<!--module name="IllegalInstantiation"/-->
92+
<!--module name="InnerAssignment"/-->
93+
<!--module name="MagicNumber"/-->
94+
<!--module name="MissingSwitchDefault"/-->
95+
<module name="RedundantThrows"/>
96+
<!--module name="SimplifyBooleanExpression"/-->
97+
<!--module name="SimplifyBooleanReturn"/-->
98+
<module name="StringLiteralEquality"/>
99+
<module name="CovariantEquals"/>
100+
<!--module name="NoClone"/-->
101+
<module name="NoFinalizer"/>
102+
<module name="PackageDeclaration"/>
103+
<!--module name="FallThrough"/-->
104+
105+
<!-- Checks for class design -->
106+
<!-- See http://checkstyle.sf.net/config_design.html -->
107+
<!--module name="DesignForExtension"/-->
108+
<!--module name="FinalClass"/-->
109+
<!--module name="HideUtilityClassConstructor"/-->
110+
<!--module name="InterfaceIsType"/-->
111+
<!--module name="VisibilityModifier"/-->
112+
113+
114+
<!-- Miscellaneous other checks. -->
115+
<!-- See http://checkstyle.sf.net/config_misc.html -->
116+
<!--module name="ArrayTypeStyle"/-->
117+
<!--module name="FinalParameters"/-->
118+
<!--module name="TodoComment"/-->
119+
<module name="UpperEll"/>
120+
</module>
121+
</module>

‎actionbarsherlock/library/AndroidManifest.xml

100644100755
+2-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="100" android:versionName="4.2.0" package="com.actionbarsherlock">
23

3-
<manifest
4-
xmlns:android="http://schemas.android.com/apk/res/android"
5-
package="com.actionbarsherlock"
6-
android:versionCode="50"
7-
android:versionName="3.5.0">
8-
9-
<uses-sdk
10-
android:minSdkVersion="4"
11-
android:targetSdkVersion="13" />
4+
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
125

136
</manifest>

‎actionbarsherlock/library/README.md

100644100755
+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ This folder contains the main library which should be linked against as an
55
Android library project in your application.
66

77
For more information see the "Including In Your Project" section of the
8-
[download page][1].
8+
[usage page][1].
99

1010

1111

1212

1313

1414

15-
[1]: http://actionbarsherlock.com/download.html
15+
[1]: http://actionbarsherlock.com/usage.html

‎actionbarsherlock/library/libs/android-support-v4.jar

265 KB
Binary file not shown.

0 commit comments

Comments
 (0)