Skip to content

Commit cdcc14b

Browse files
author
jfeinstein10
committed
Fixing files for ActionBarSherlock
1 parent 41c129e commit cdcc14b

File tree

592 files changed

+1100
-14461
lines changed

Some content is hidden

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

592 files changed

+1100
-14461
lines changed
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.actionbarsherlock"
4-
android:versionCode="51"
5-
android:versionName="4.0.1-SNAPSHOT" >
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="90" android:versionName="4.1.0" package="com.actionbarsherlock">
63

7-
<uses-sdk
8-
android:minSdkVersion="7"
9-
android:targetSdkVersion="15" />
4+
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="15"/>
105

11-
</manifest>
6+
</manifest>

ActionBarSherlockSlidingMenu/bin/jarlist.cache

Lines changed: 0 additions & 3 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

ActionBarSherlockSlidingMenu/gen/com/actionbarsherlock/R.java

Lines changed: 74 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -709,88 +709,80 @@ public static final class drawable {
709709
public static int abs__ab_solid_light_holo=0x7f020008;
710710
public static int abs__ab_solid_shadow_holo=0x7f020009;
711711
public static int abs__ab_stacked_solid_dark_holo=0x7f02000a;
712-
public static int abs__ab_stacked_solid_inverse_holo=0x7f02000b;
713-
public static int abs__ab_stacked_solid_light_holo=0x7f02000c;
714-
public static int abs__ab_stacked_transparent_dark_holo=0x7f02000d;
715-
public static int abs__ab_stacked_transparent_light_holo=0x7f02000e;
716-
public static int abs__ab_transparent_dark_holo=0x7f02000f;
717-
public static int abs__ab_transparent_light_holo=0x7f020010;
718-
public static int abs__activated_background_holo_dark=0x7f020011;
719-
public static int abs__activated_background_holo_light=0x7f020012;
720-
public static int abs__btn_cab_done_default_holo_dark=0x7f020013;
721-
public static int abs__btn_cab_done_default_holo_light=0x7f020014;
722-
public static int abs__btn_cab_done_focused_holo_dark=0x7f020015;
723-
public static int abs__btn_cab_done_focused_holo_light=0x7f020016;
724-
public static int abs__btn_cab_done_holo_dark=0x7f020017;
725-
public static int abs__btn_cab_done_holo_light=0x7f020018;
726-
public static int abs__btn_cab_done_pressed_holo_dark=0x7f020019;
727-
public static int abs__btn_cab_done_pressed_holo_light=0x7f02001a;
728-
public static int abs__cab_background_bottom_holo_dark=0x7f02001b;
729-
public static int abs__cab_background_bottom_holo_light=0x7f02001c;
730-
public static int abs__cab_background_top_holo_dark=0x7f02001d;
731-
public static int abs__cab_background_top_holo_light=0x7f02001e;
732-
public static int abs__dialog_bottom_holo_dark=0x7f02001f;
733-
public static int abs__dialog_bottom_holo_light=0x7f020020;
734-
public static int abs__dialog_full_holo_dark=0x7f020021;
735-
public static int abs__dialog_full_holo_light=0x7f020022;
736-
public static int abs__ic_ab_back_holo_dark=0x7f020023;
737-
public static int abs__ic_ab_back_holo_light=0x7f020024;
738-
public static int abs__ic_cab_done_holo_dark=0x7f020025;
739-
public static int abs__ic_cab_done_holo_light=0x7f020026;
740-
public static int abs__ic_menu_moreoverflow_holo_dark=0x7f020027;
741-
public static int abs__ic_menu_moreoverflow_holo_light=0x7f020028;
742-
public static int abs__ic_menu_moreoverflow_normal_holo_dark=0x7f020029;
743-
public static int abs__ic_menu_moreoverflow_normal_holo_light=0x7f02002a;
744-
public static int abs__ic_menu_share_holo_dark=0x7f02002b;
745-
public static int abs__ic_menu_share_holo_light=0x7f02002c;
746-
public static int abs__item_background_holo_dark=0x7f02002d;
747-
public static int abs__item_background_holo_light=0x7f02002e;
748-
public static int abs__list_activated_holo=0x7f02002f;
749-
public static int abs__list_divider_holo_dark=0x7f020030;
750-
public static int abs__list_divider_holo_light=0x7f020031;
751-
public static int abs__list_focused_holo=0x7f020032;
752-
public static int abs__list_longpressed_holo=0x7f020033;
753-
public static int abs__list_pressed_holo_dark=0x7f020034;
754-
public static int abs__list_pressed_holo_light=0x7f020035;
755-
public static int abs__list_selector_background_transition_holo_dark=0x7f020036;
756-
public static int abs__list_selector_background_transition_holo_light=0x7f020037;
757-
public static int abs__list_selector_disabled_holo_dark=0x7f020038;
758-
public static int abs__list_selector_disabled_holo_light=0x7f020039;
759-
public static int abs__list_selector_holo_dark=0x7f02003a;
760-
public static int abs__list_selector_holo_light=0x7f02003b;
761-
public static int abs__menu_dropdown_panel_holo_dark=0x7f02003c;
762-
public static int abs__menu_dropdown_panel_holo_light=0x7f02003d;
763-
public static int abs__progress_bg_holo_dark=0x7f02003e;
764-
public static int abs__progress_bg_holo_light=0x7f02003f;
765-
public static int abs__progress_horizontal_holo_dark=0x7f020040;
766-
public static int abs__progress_horizontal_holo_light=0x7f020041;
767-
public static int abs__progress_medium_holo=0x7f020042;
768-
public static int abs__progress_primary_holo_dark=0x7f020043;
769-
public static int abs__progress_primary_holo_light=0x7f020044;
770-
public static int abs__progress_secondary_holo_dark=0x7f020045;
771-
public static int abs__progress_secondary_holo_light=0x7f020046;
772-
public static int abs__spinner_20_inner_holo=0x7f020047;
773-
public static int abs__spinner_20_outer_holo=0x7f020048;
774-
public static int abs__spinner_48_inner_holo=0x7f020049;
775-
public static int abs__spinner_48_outer_holo=0x7f02004a;
776-
public static int abs__spinner_ab_default_holo_dark=0x7f02004b;
777-
public static int abs__spinner_ab_default_holo_light=0x7f02004c;
778-
public static int abs__spinner_ab_disabled_holo_dark=0x7f02004d;
779-
public static int abs__spinner_ab_disabled_holo_light=0x7f02004e;
780-
public static int abs__spinner_ab_focused_holo_dark=0x7f02004f;
781-
public static int abs__spinner_ab_focused_holo_light=0x7f020050;
782-
public static int abs__spinner_ab_holo_dark=0x7f020051;
783-
public static int abs__spinner_ab_holo_light=0x7f020052;
784-
public static int abs__spinner_ab_pressed_holo_dark=0x7f020053;
785-
public static int abs__spinner_ab_pressed_holo_light=0x7f020054;
786-
public static int abs__tab_indicator_ab_holo=0x7f020055;
787-
public static int abs__tab_indicator_holo=0x7f020056;
788-
public static int abs__tab_selected_focused_holo=0x7f020057;
789-
public static int abs__tab_selected_holo=0x7f020058;
790-
public static int abs__tab_selected_pressed_holo=0x7f020059;
791-
public static int abs__tab_unselected_focused_holo=0x7f02005a;
792-
public static int abs__tab_unselected_holo=0x7f02005b;
793-
public static int abs__tab_unselected_pressed_holo=0x7f02005c;
712+
public static int abs__ab_stacked_solid_light_holo=0x7f02000b;
713+
public static int abs__ab_stacked_transparent_dark_holo=0x7f02000c;
714+
public static int abs__ab_stacked_transparent_light_holo=0x7f02000d;
715+
public static int abs__ab_transparent_dark_holo=0x7f02000e;
716+
public static int abs__ab_transparent_light_holo=0x7f02000f;
717+
public static int abs__activated_background_holo_dark=0x7f020010;
718+
public static int abs__activated_background_holo_light=0x7f020011;
719+
public static int abs__btn_cab_done_default_holo_dark=0x7f020012;
720+
public static int abs__btn_cab_done_default_holo_light=0x7f020013;
721+
public static int abs__btn_cab_done_focused_holo_dark=0x7f020014;
722+
public static int abs__btn_cab_done_focused_holo_light=0x7f020015;
723+
public static int abs__btn_cab_done_holo_dark=0x7f020016;
724+
public static int abs__btn_cab_done_holo_light=0x7f020017;
725+
public static int abs__btn_cab_done_pressed_holo_dark=0x7f020018;
726+
public static int abs__btn_cab_done_pressed_holo_light=0x7f020019;
727+
public static int abs__cab_background_bottom_holo_dark=0x7f02001a;
728+
public static int abs__cab_background_bottom_holo_light=0x7f02001b;
729+
public static int abs__cab_background_top_holo_dark=0x7f02001c;
730+
public static int abs__cab_background_top_holo_light=0x7f02001d;
731+
public static int abs__dialog_full_holo_dark=0x7f02001e;
732+
public static int abs__dialog_full_holo_light=0x7f02001f;
733+
public static int abs__ic_ab_back_holo_dark=0x7f020020;
734+
public static int abs__ic_ab_back_holo_light=0x7f020021;
735+
public static int abs__ic_cab_done_holo_dark=0x7f020022;
736+
public static int abs__ic_cab_done_holo_light=0x7f020023;
737+
public static int abs__ic_menu_moreoverflow_holo_dark=0x7f020024;
738+
public static int abs__ic_menu_moreoverflow_holo_light=0x7f020025;
739+
public static int abs__ic_menu_moreoverflow_normal_holo_dark=0x7f020026;
740+
public static int abs__ic_menu_moreoverflow_normal_holo_light=0x7f020027;
741+
public static int abs__ic_menu_share_holo_dark=0x7f020028;
742+
public static int abs__ic_menu_share_holo_light=0x7f020029;
743+
public static int abs__item_background_holo_dark=0x7f02002a;
744+
public static int abs__item_background_holo_light=0x7f02002b;
745+
public static int abs__list_activated_holo=0x7f02002c;
746+
public static int abs__list_divider_holo_dark=0x7f02002d;
747+
public static int abs__list_divider_holo_light=0x7f02002e;
748+
public static int abs__list_focused_holo=0x7f02002f;
749+
public static int abs__list_longpressed_holo=0x7f020030;
750+
public static int abs__list_pressed_holo_dark=0x7f020031;
751+
public static int abs__list_pressed_holo_light=0x7f020032;
752+
public static int abs__list_selector_background_transition_holo_dark=0x7f020033;
753+
public static int abs__list_selector_background_transition_holo_light=0x7f020034;
754+
public static int abs__list_selector_disabled_holo_dark=0x7f020035;
755+
public static int abs__list_selector_disabled_holo_light=0x7f020036;
756+
public static int abs__list_selector_holo_dark=0x7f020037;
757+
public static int abs__list_selector_holo_light=0x7f020038;
758+
public static int abs__menu_dropdown_panel_holo_dark=0x7f020039;
759+
public static int abs__menu_dropdown_panel_holo_light=0x7f02003a;
760+
public static int abs__progress_bg_holo_dark=0x7f02003b;
761+
public static int abs__progress_bg_holo_light=0x7f02003c;
762+
public static int abs__progress_horizontal_holo_dark=0x7f02003d;
763+
public static int abs__progress_horizontal_holo_light=0x7f02003e;
764+
public static int abs__progress_medium_holo=0x7f02003f;
765+
public static int abs__progress_primary_holo_dark=0x7f020040;
766+
public static int abs__progress_primary_holo_light=0x7f020041;
767+
public static int abs__progress_secondary_holo_dark=0x7f020042;
768+
public static int abs__progress_secondary_holo_light=0x7f020043;
769+
public static int abs__spinner_48_inner_holo=0x7f020044;
770+
public static int abs__spinner_48_outer_holo=0x7f020045;
771+
public static int abs__spinner_ab_default_holo_dark=0x7f020046;
772+
public static int abs__spinner_ab_default_holo_light=0x7f020047;
773+
public static int abs__spinner_ab_disabled_holo_dark=0x7f020048;
774+
public static int abs__spinner_ab_disabled_holo_light=0x7f020049;
775+
public static int abs__spinner_ab_focused_holo_dark=0x7f02004a;
776+
public static int abs__spinner_ab_focused_holo_light=0x7f02004b;
777+
public static int abs__spinner_ab_holo_dark=0x7f02004c;
778+
public static int abs__spinner_ab_holo_light=0x7f02004d;
779+
public static int abs__spinner_ab_pressed_holo_dark=0x7f02004e;
780+
public static int abs__spinner_ab_pressed_holo_light=0x7f02004f;
781+
public static int abs__tab_indicator_ab_holo=0x7f020050;
782+
public static int abs__tab_selected_focused_holo=0x7f020051;
783+
public static int abs__tab_selected_holo=0x7f020052;
784+
public static int abs__tab_selected_pressed_holo=0x7f020053;
785+
public static int abs__tab_unselected_pressed_holo=0x7f020054;
794786
}
795787
public static final class id {
796788
public static int abs__action_bar=0x7f040022;

ActionBarSherlockSlidingMenu/pom.xml

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.actionbarsherlock</groupId>
1313
<artifactId>parent</artifactId>
14-
<version>4.0.1</version>
14+
<version>4.1.0</version>
1515
<relativePath>../pom.xml</relativePath>
1616
</parent>
1717

@@ -148,39 +148,4 @@
148148
</plugins>
149149
</pluginManagement>
150150
</build>
151-
152-
<profiles>
153-
<profile>
154-
<id>release</id>
155-
<activation>
156-
<property>
157-
<name>performRelease</name>
158-
<value>true</value>
159-
</property>
160-
</activation>
161-
<build>
162-
<plugins>
163-
<plugin>
164-
<groupId>com.jayway.maven.plugins.android.generation2</groupId>
165-
<artifactId>android-maven-plugin</artifactId>
166-
<version>${android-maven.version}</version>
167-
<configuration>
168-
<manifest>
169-
<versionCodeAutoIncrement>true</versionCodeAutoIncrement>
170-
</manifest>
171-
</configuration>
172-
<executions>
173-
<execution>
174-
<id>manifestUpdate</id>
175-
<phase>process-resources</phase>
176-
<goals>
177-
<goal>manifest-update</goal>
178-
</goals>
179-
</execution>
180-
</executions>
181-
</plugin>
182-
</plugins>
183-
</build>
184-
</profile>
185-
</profiles>
186151
</project>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

ActionBarSherlockSlidingMenu/res/drawable/abs__activated_background_holo_dark.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918
<item android:state_activated="true" android:drawable="@drawable/abs__list_activated_holo" />
2019
<item android:drawable="@android:color/transparent" />
2120
</selector>

ActionBarSherlockSlidingMenu/res/drawable/abs__activated_background_holo_light.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918
<item android:state_activated="true" android:drawable="@drawable/abs__list_activated_holo" />
2019
<item android:drawable="@android:color/transparent" />
2120
</selector>

ActionBarSherlockSlidingMenu/res/drawable/abs__btn_cab_done_holo_dark.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918
<item android:state_pressed="true"
2019
android:drawable="@drawable/abs__btn_cab_done_pressed_holo_dark" />
2120
<item android:state_focused="true" android:state_enabled="true"

ActionBarSherlockSlidingMenu/res/drawable/abs__btn_cab_done_holo_light.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918
<item android:state_pressed="true"
2019
android:drawable="@drawable/abs__btn_cab_done_pressed_holo_light" />
2120
<item android:state_focused="true" android:state_enabled="true"

ActionBarSherlockSlidingMenu/res/drawable/abs__item_background_holo_dark.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918

2019
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
2120
<item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/abs__list_selector_disabled_holo_dark" />

ActionBarSherlockSlidingMenu/res/drawable/abs__item_background_holo_light.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918

2019
<!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
2120
<item android:state_focused="true" android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/abs__list_selector_disabled_holo_light" />

ActionBarSherlockSlidingMenu/res/drawable/abs__list_selector_holo_dark.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918

2019
<item android:state_window_focused="false" android:drawable="@android:color/transparent" />
2120

ActionBarSherlockSlidingMenu/res/drawable/abs__list_selector_holo_light.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
limitations under the License.
1515
-->
1616

17-
<selector xmlns:android="http://schemas.android.com/apk/res/android"
18-
android:exitFadeDuration="@android:integer/config_mediumAnimTime">
17+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
1918

2019
<item android:state_window_focused="false" android:drawable="@android:color/transparent" />
2120

ActionBarSherlockSlidingMenu/res/drawable/abs__tab_indicator_holo.xml

Lines changed: 0 additions & 34 deletions
This file was deleted.

ActionBarSherlockSlidingMenu/res/layout/abs__action_menu_layout.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
66
You may obtain a copy of the License at
7-
7+
88
http://www.apache.org/licenses/LICENSE-2.0
9-
9+
1010
Unless required by applicable law or agreed to in writing, software
1111
distributed under the License is distributed on an "AS IS" BASIS,
1212
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,6 +18,6 @@
1818
xmlns:android="http://schemas.android.com/apk/res/android"
1919
android:layout_width="wrap_content"
2020
android:layout_height="wrap_content"
21-
android:divider="?attr/dividerVertical"
21+
android:divider="?attr/actionBarDivider"
2222
android:dividerPadding="12dip"
2323
android:gravity="center_vertical" />

0 commit comments

Comments
 (0)