Skip to content

Commit 982b5c0

Browse files
author
jfeinstein10
committed
Bug fixes for SlidingActivity and getting rid of setContentView methods
1 parent 41a2afa commit 982b5c0

File tree

16 files changed

+403
-400
lines changed

16 files changed

+403
-400
lines changed

‎example/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:label="@string/app_name"
1414
android:theme="@style/Theme.Sherlock.Light.DarkActionBar" >
1515
<activity
16-
android:name=".ExampleActivity"
16+
android:name=".ExampleSlidingActivity"
1717
android:label="@string/app_name"
1818
android:uiOptions="splitActionBarWhenNarrow" >
1919
<intent-filter>

‎example/bin/classes.dex

59.5 KB
Binary file not shown.

‎example/bin/example.apk

21.1 KB
Binary file not shown.

‎example/bin/resources.ap_

-1.35 KB
Binary file not shown.

‎example/gen/com/actionbarsherlock/R.java

Lines changed: 79 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -759,89 +759,81 @@ public static final class drawable {
759759
public static final int abs__ab_solid_light_holo=0x7f020008;
760760
public static final int abs__ab_solid_shadow_holo=0x7f020009;
761761
public static final int abs__ab_stacked_solid_dark_holo=0x7f02000a;
762-
public static final int abs__ab_stacked_solid_inverse_holo=0x7f02000b;
763-
public static final int abs__ab_stacked_solid_light_holo=0x7f02000c;
764-
public static final int abs__ab_stacked_transparent_dark_holo=0x7f02000d;
765-
public static final int abs__ab_stacked_transparent_light_holo=0x7f02000e;
766-
public static final int abs__ab_transparent_dark_holo=0x7f02000f;
767-
public static final int abs__ab_transparent_light_holo=0x7f020010;
768-
public static final int abs__activated_background_holo_dark=0x7f020011;
769-
public static final int abs__activated_background_holo_light=0x7f020012;
770-
public static final int abs__btn_cab_done_default_holo_dark=0x7f020013;
771-
public static final int abs__btn_cab_done_default_holo_light=0x7f020014;
772-
public static final int abs__btn_cab_done_focused_holo_dark=0x7f020015;
773-
public static final int abs__btn_cab_done_focused_holo_light=0x7f020016;
774-
public static final int abs__btn_cab_done_holo_dark=0x7f020017;
775-
public static final int abs__btn_cab_done_holo_light=0x7f020018;
776-
public static final int abs__btn_cab_done_pressed_holo_dark=0x7f020019;
777-
public static final int abs__btn_cab_done_pressed_holo_light=0x7f02001a;
778-
public static final int abs__cab_background_bottom_holo_dark=0x7f02001b;
779-
public static final int abs__cab_background_bottom_holo_light=0x7f02001c;
780-
public static final int abs__cab_background_top_holo_dark=0x7f02001d;
781-
public static final int abs__cab_background_top_holo_light=0x7f02001e;
782-
public static final int abs__dialog_bottom_holo_dark=0x7f02001f;
783-
public static final int abs__dialog_bottom_holo_light=0x7f020020;
784-
public static final int abs__dialog_full_holo_dark=0x7f020021;
785-
public static final int abs__dialog_full_holo_light=0x7f020022;
786-
public static final int abs__ic_ab_back_holo_dark=0x7f020023;
787-
public static final int abs__ic_ab_back_holo_light=0x7f020024;
788-
public static final int abs__ic_cab_done_holo_dark=0x7f020025;
789-
public static final int abs__ic_cab_done_holo_light=0x7f020026;
790-
public static final int abs__ic_menu_moreoverflow_holo_dark=0x7f020027;
791-
public static final int abs__ic_menu_moreoverflow_holo_light=0x7f020028;
792-
public static final int abs__ic_menu_moreoverflow_normal_holo_dark=0x7f020029;
793-
public static final int abs__ic_menu_moreoverflow_normal_holo_light=0x7f02002a;
794-
public static final int abs__ic_menu_share_holo_dark=0x7f02002b;
795-
public static final int abs__ic_menu_share_holo_light=0x7f02002c;
796-
public static final int abs__item_background_holo_dark=0x7f02002d;
797-
public static final int abs__item_background_holo_light=0x7f02002e;
798-
public static final int abs__list_activated_holo=0x7f02002f;
799-
public static final int abs__list_divider_holo_dark=0x7f020030;
800-
public static final int abs__list_divider_holo_light=0x7f020031;
801-
public static final int abs__list_focused_holo=0x7f020032;
802-
public static final int abs__list_longpressed_holo=0x7f020033;
803-
public static final int abs__list_pressed_holo_dark=0x7f020034;
804-
public static final int abs__list_pressed_holo_light=0x7f020035;
805-
public static final int abs__list_selector_background_transition_holo_dark=0x7f020036;
806-
public static final int abs__list_selector_background_transition_holo_light=0x7f020037;
807-
public static final int abs__list_selector_disabled_holo_dark=0x7f020038;
808-
public static final int abs__list_selector_disabled_holo_light=0x7f020039;
809-
public static final int abs__list_selector_holo_dark=0x7f02003a;
810-
public static final int abs__list_selector_holo_light=0x7f02003b;
811-
public static final int abs__menu_dropdown_panel_holo_dark=0x7f02003c;
812-
public static final int abs__menu_dropdown_panel_holo_light=0x7f02003d;
813-
public static final int abs__progress_bg_holo_dark=0x7f02003e;
814-
public static final int abs__progress_bg_holo_light=0x7f02003f;
815-
public static final int abs__progress_horizontal_holo_dark=0x7f020040;
816-
public static final int abs__progress_horizontal_holo_light=0x7f020041;
817-
public static final int abs__progress_medium_holo=0x7f020042;
818-
public static final int abs__progress_primary_holo_dark=0x7f020043;
819-
public static final int abs__progress_primary_holo_light=0x7f020044;
820-
public static final int abs__progress_secondary_holo_dark=0x7f020045;
821-
public static final int abs__progress_secondary_holo_light=0x7f020046;
822-
public static final int abs__spinner_20_inner_holo=0x7f020047;
823-
public static final int abs__spinner_20_outer_holo=0x7f020048;
824-
public static final int abs__spinner_48_inner_holo=0x7f020049;
825-
public static final int abs__spinner_48_outer_holo=0x7f02004a;
826-
public static final int abs__spinner_ab_default_holo_dark=0x7f02004b;
827-
public static final int abs__spinner_ab_default_holo_light=0x7f02004c;
828-
public static final int abs__spinner_ab_disabled_holo_dark=0x7f02004d;
829-
public static final int abs__spinner_ab_disabled_holo_light=0x7f02004e;
830-
public static final int abs__spinner_ab_focused_holo_dark=0x7f02004f;
831-
public static final int abs__spinner_ab_focused_holo_light=0x7f020050;
832-
public static final int abs__spinner_ab_holo_dark=0x7f020051;
833-
public static final int abs__spinner_ab_holo_light=0x7f020052;
834-
public static final int abs__spinner_ab_pressed_holo_dark=0x7f020053;
835-
public static final int abs__spinner_ab_pressed_holo_light=0x7f020054;
836-
public static final int abs__tab_indicator_ab_holo=0x7f020055;
837-
public static final int abs__tab_indicator_holo=0x7f020056;
838-
public static final int abs__tab_selected_focused_holo=0x7f020057;
839-
public static final int abs__tab_selected_holo=0x7f020058;
840-
public static final int abs__tab_selected_pressed_holo=0x7f020059;
841-
public static final int abs__tab_unselected_focused_holo=0x7f02005a;
842-
public static final int abs__tab_unselected_holo=0x7f02005b;
843-
public static final int abs__tab_unselected_pressed_holo=0x7f02005c;
844-
public static final int ic_launcher=0x7f02005d;
762+
public static final int abs__ab_stacked_solid_light_holo=0x7f02000b;
763+
public static final int abs__ab_stacked_transparent_dark_holo=0x7f02000c;
764+
public static final int abs__ab_stacked_transparent_light_holo=0x7f02000d;
765+
public static final int abs__ab_transparent_dark_holo=0x7f02000e;
766+
public static final int abs__ab_transparent_light_holo=0x7f02000f;
767+
public static final int abs__activated_background_holo_dark=0x7f020010;
768+
public static final int abs__activated_background_holo_light=0x7f020011;
769+
public static final int abs__btn_cab_done_default_holo_dark=0x7f020012;
770+
public static final int abs__btn_cab_done_default_holo_light=0x7f020013;
771+
public static final int abs__btn_cab_done_focused_holo_dark=0x7f020014;
772+
public static final int abs__btn_cab_done_focused_holo_light=0x7f020015;
773+
public static final int abs__btn_cab_done_holo_dark=0x7f020016;
774+
public static final int abs__btn_cab_done_holo_light=0x7f020017;
775+
public static final int abs__btn_cab_done_pressed_holo_dark=0x7f020018;
776+
public static final int abs__btn_cab_done_pressed_holo_light=0x7f020019;
777+
public static final int abs__cab_background_bottom_holo_dark=0x7f02001a;
778+
public static final int abs__cab_background_bottom_holo_light=0x7f02001b;
779+
public static final int abs__cab_background_top_holo_dark=0x7f02001c;
780+
public static final int abs__cab_background_top_holo_light=0x7f02001d;
781+
public static final int abs__dialog_full_holo_dark=0x7f02001e;
782+
public static final int abs__dialog_full_holo_light=0x7f02001f;
783+
public static final int abs__ic_ab_back_holo_dark=0x7f020020;
784+
public static final int abs__ic_ab_back_holo_light=0x7f020021;
785+
public static final int abs__ic_cab_done_holo_dark=0x7f020022;
786+
public static final int abs__ic_cab_done_holo_light=0x7f020023;
787+
public static final int abs__ic_menu_moreoverflow_holo_dark=0x7f020024;
788+
public static final int abs__ic_menu_moreoverflow_holo_light=0x7f020025;
789+
public static final int abs__ic_menu_moreoverflow_normal_holo_dark=0x7f020026;
790+
public static final int abs__ic_menu_moreoverflow_normal_holo_light=0x7f020027;
791+
public static final int abs__ic_menu_share_holo_dark=0x7f020028;
792+
public static final int abs__ic_menu_share_holo_light=0x7f020029;
793+
public static final int abs__item_background_holo_dark=0x7f02002a;
794+
public static final int abs__item_background_holo_light=0x7f02002b;
795+
public static final int abs__list_activated_holo=0x7f02002c;
796+
public static final int abs__list_divider_holo_dark=0x7f02002d;
797+
public static final int abs__list_divider_holo_light=0x7f02002e;
798+
public static final int abs__list_focused_holo=0x7f02002f;
799+
public static final int abs__list_longpressed_holo=0x7f020030;
800+
public static final int abs__list_pressed_holo_dark=0x7f020031;
801+
public static final int abs__list_pressed_holo_light=0x7f020032;
802+
public static final int abs__list_selector_background_transition_holo_dark=0x7f020033;
803+
public static final int abs__list_selector_background_transition_holo_light=0x7f020034;
804+
public static final int abs__list_selector_disabled_holo_dark=0x7f020035;
805+
public static final int abs__list_selector_disabled_holo_light=0x7f020036;
806+
public static final int abs__list_selector_holo_dark=0x7f020037;
807+
public static final int abs__list_selector_holo_light=0x7f020038;
808+
public static final int abs__menu_dropdown_panel_holo_dark=0x7f020039;
809+
public static final int abs__menu_dropdown_panel_holo_light=0x7f02003a;
810+
public static final int abs__progress_bg_holo_dark=0x7f02003b;
811+
public static final int abs__progress_bg_holo_light=0x7f02003c;
812+
public static final int abs__progress_horizontal_holo_dark=0x7f02003d;
813+
public static final int abs__progress_horizontal_holo_light=0x7f02003e;
814+
public static final int abs__progress_medium_holo=0x7f02003f;
815+
public static final int abs__progress_primary_holo_dark=0x7f020040;
816+
public static final int abs__progress_primary_holo_light=0x7f020041;
817+
public static final int abs__progress_secondary_holo_dark=0x7f020042;
818+
public static final int abs__progress_secondary_holo_light=0x7f020043;
819+
public static final int abs__spinner_48_inner_holo=0x7f020044;
820+
public static final int abs__spinner_48_outer_holo=0x7f020045;
821+
public static final int abs__spinner_ab_default_holo_dark=0x7f020046;
822+
public static final int abs__spinner_ab_default_holo_light=0x7f020047;
823+
public static final int abs__spinner_ab_disabled_holo_dark=0x7f020048;
824+
public static final int abs__spinner_ab_disabled_holo_light=0x7f020049;
825+
public static final int abs__spinner_ab_focused_holo_dark=0x7f02004a;
826+
public static final int abs__spinner_ab_focused_holo_light=0x7f02004b;
827+
public static final int abs__spinner_ab_holo_dark=0x7f02004c;
828+
public static final int abs__spinner_ab_holo_light=0x7f02004d;
829+
public static final int abs__spinner_ab_pressed_holo_dark=0x7f02004e;
830+
public static final int abs__spinner_ab_pressed_holo_light=0x7f02004f;
831+
public static final int abs__tab_indicator_ab_holo=0x7f020050;
832+
public static final int abs__tab_selected_focused_holo=0x7f020051;
833+
public static final int abs__tab_selected_holo=0x7f020052;
834+
public static final int abs__tab_selected_pressed_holo=0x7f020053;
835+
public static final int abs__tab_unselected_pressed_holo=0x7f020054;
836+
public static final int ic_launcher=0x7f020055;
845837
}
846838
public static final class id {
847839
public static final int abs__action_bar=0x7f040024;
@@ -879,8 +871,8 @@ public static final class id {
879871
public static final int frame=0x7f040029;
880872
public static final int fullscreen=0x7f040011;
881873
public static final int homeAsUp=0x7f040006;
882-
public static final int item1=0x7f040037;
883-
public static final int item2=0x7f040038;
874+
public static final int item1=0x7f040035;
875+
public static final int item2=0x7f040036;
884876
public static final int listMode=0x7f040002;
885877
public static final int logo=0x7f04002c;
886878
public static final int logo2=0x7f04002d;
@@ -893,11 +885,9 @@ public static final class id {
893885
public static final int showCustom=0x7f040008;
894886
public static final int showHome=0x7f040005;
895887
public static final int showTitle=0x7f040007;
896-
public static final int slidingmenubehind=0x7f040033;
897888
public static final int slidingmenulayout=0x7f040032;
898-
public static final int slidingmenupager=0x7f040034;
899-
public static final int slidingmenurowicon=0x7f040035;
900-
public static final int slidingmenurowtitle=0x7f040036;
889+
public static final int slidingmenurowicon=0x7f040033;
890+
public static final int slidingmenurowtitle=0x7f040034;
901891
public static final int tabMode=0x7f040003;
902892
public static final int useLogo=0x7f040004;
903893
public static final int wrap_content=0x7f040000;

0 commit comments

Comments
 (0)