merge

bin/R.txt

@@ -82,83 +82,87 @@ int dimen signin_header_height 0x7f08000f
 int dimen signin_header_padding 0x7f080011
 int dimen signin_header_textsize 0x7f080010
 int dimen signin_layoutmargin 0x7f080012
-int drawable com_facebook_button_blue 0x7f020000
-int drawable com_facebook_button_blue_focused 0x7f020001
-int drawable com_facebook_button_blue_normal 0x7f020002
-int drawable com_facebook_button_blue_pressed 0x7f020003
-int drawable com_facebook_button_check 0x7f020004
-int drawable com_facebook_button_check_off 0x7f020005
-int drawable com_facebook_button_check_on 0x7f020006
-int drawable com_facebook_button_grey_focused 0x7f020007
-int drawable com_facebook_button_grey_normal 0x7f020008
-int drawable com_facebook_button_grey_pressed 0x7f020009
-int drawable com_facebook_close 0x7f02000a
-int drawable com_facebook_inverse_icon 0x7f02000b
-int drawable com_facebook_list_divider 0x7f02000c
-int drawable com_facebook_list_section_header_background 0x7f02000d
-int drawable com_facebook_loginbutton_silver 0x7f02000e
-int drawable com_facebook_logo 0x7f02000f
-int drawable com_facebook_picker_default_separator_color 0x7f02004c
-int drawable com_facebook_picker_item_background 0x7f020010
-int drawable com_facebook_picker_list_focused 0x7f020011
-int drawable com_facebook_picker_list_longpressed 0x7f020012
-int drawable com_facebook_picker_list_pressed 0x7f020013
-int drawable com_facebook_picker_list_selector 0x7f020014
-int drawable com_facebook_picker_list_selector_background_transition 0x7f020015
-int drawable com_facebook_picker_list_selector_disabled 0x7f020016
-int drawable com_facebook_picker_magnifier 0x7f020017
-int drawable com_facebook_picker_top_button 0x7f020018
-int drawable com_facebook_place_default_icon 0x7f020019
-int drawable com_facebook_profile_default_icon 0x7f02001a
-int drawable com_facebook_profile_picture_blank_portrait 0x7f02001b
-int drawable com_facebook_profile_picture_blank_square 0x7f02001c
-int drawable com_facebook_top_background 0x7f02001d
-int drawable com_facebook_top_button 0x7f02001e
-int drawable com_facebook_usersettingsfragment_background_gradient 0x7f02001f
-int drawable common_signin_btn_icon_dark 0x7f020020
-int drawable common_signin_btn_icon_disabled_dark 0x7f020021
-int drawable common_signin_btn_icon_disabled_focus_dark 0x7f020022
-int drawable common_signin_btn_icon_disabled_focus_light 0x7f020023
-int drawable common_signin_btn_icon_disabled_light 0x7f020024
-int drawable common_signin_btn_icon_focus_dark 0x7f020025
-int drawable common_signin_btn_icon_focus_light 0x7f020026
-int drawable common_signin_btn_icon_light 0x7f020027
-int drawable common_signin_btn_icon_normal_dark 0x7f020028
-int drawable common_signin_btn_icon_normal_light 0x7f020029
-int drawable common_signin_btn_icon_pressed_dark 0x7f02002a
-int drawable common_signin_btn_icon_pressed_light 0x7f02002b
-int drawable common_signin_btn_text_dark 0x7f02002c
-int drawable common_signin_btn_text_disabled_dark 0x7f02002d
-int drawable common_signin_btn_text_disabled_focus_dark 0x7f02002e
-int drawable common_signin_btn_text_disabled_focus_light 0x7f02002f
-int drawable common_signin_btn_text_disabled_light 0x7f020030
-int drawable common_signin_btn_text_focus_dark 0x7f020031
-int drawable common_signin_btn_text_focus_light 0x7f020032
-int drawable common_signin_btn_text_light 0x7f020033
-int drawable common_signin_btn_text_normal_dark 0x7f020034
-int drawable common_signin_btn_text_normal_light 0x7f020035
-int drawable common_signin_btn_text_pressed_dark 0x7f020036
-int drawable common_signin_btn_text_pressed_light 0x7f020037
-int drawable fb_layout_selection 0x7f020038
-int drawable gmail_layout_selection 0x7f020039
-int drawable ic_email 0x7f02003a
-int drawable ic_facebook 0x7f02003b
-int drawable ic_google 0x7f02003c
-int drawable ic_help 0x7f02003d
-int drawable ic_launcher 0x7f02003e
-int drawable ic_location 0x7f02003f
-int drawable ic_mobile 0x7f020040
-int drawable ic_otp 0x7f020041
-int drawable ic_password 0x7f020042
-int drawable ic_plusone_medium_off_client 0x7f020043
-int drawable ic_plusone_small_off_client 0x7f020044
-int drawable ic_plusone_standard_off_client 0x7f020045
-int drawable ic_plusone_tall_off_client 0x7f020046
-int drawable ic_tab_back 0x7f020047
-int drawable ic_tab_gboomba 0x7f020048
-int drawable signin_btn_selecton 0x7f020049
-int drawable splash 0x7f02004a
-int drawable tab_bg_repeatx 0x7f02004b
+int drawable border_form_elements 0x7f020000
+int drawable border_form_elements_1 0x7f020001
+int drawable border_form_elements_selected 0x7f020002
+int drawable border_form_elements_selected_1 0x7f020003
+int drawable com_facebook_button_blue 0x7f020004
+int drawable com_facebook_button_blue_focused 0x7f020005
+int drawable com_facebook_button_blue_normal 0x7f020006
+int drawable com_facebook_button_blue_pressed 0x7f020007
+int drawable com_facebook_button_check 0x7f020008
+int drawable com_facebook_button_check_off 0x7f020009
+int drawable com_facebook_button_check_on 0x7f02000a
+int drawable com_facebook_button_grey_focused 0x7f02000b
+int drawable com_facebook_button_grey_normal 0x7f02000c
+int drawable com_facebook_button_grey_pressed 0x7f02000d
+int drawable com_facebook_close 0x7f02000e
+int drawable com_facebook_inverse_icon 0x7f02000f
+int drawable com_facebook_list_divider 0x7f020010
+int drawable com_facebook_list_section_header_background 0x7f020011
+int drawable com_facebook_loginbutton_silver 0x7f020012
+int drawable com_facebook_logo 0x7f020013
+int drawable com_facebook_picker_default_separator_color 0x7f020050
+int drawable com_facebook_picker_item_background 0x7f020014
+int drawable com_facebook_picker_list_focused 0x7f020015
+int drawable com_facebook_picker_list_longpressed 0x7f020016
+int drawable com_facebook_picker_list_pressed 0x7f020017
+int drawable com_facebook_picker_list_selector 0x7f020018
+int drawable com_facebook_picker_list_selector_background_transition 0x7f020019
+int drawable com_facebook_picker_list_selector_disabled 0x7f02001a
+int drawable com_facebook_picker_magnifier 0x7f02001b
+int drawable com_facebook_picker_top_button 0x7f02001c
+int drawable com_facebook_place_default_icon 0x7f02001d
+int drawable com_facebook_profile_default_icon 0x7f02001e
+int drawable com_facebook_profile_picture_blank_portrait 0x7f02001f
+int drawable com_facebook_profile_picture_blank_square 0x7f020020
+int drawable com_facebook_top_background 0x7f020021
+int drawable com_facebook_top_button 0x7f020022
+int drawable com_facebook_usersettingsfragment_background_gradient 0x7f020023
+int drawable common_signin_btn_icon_dark 0x7f020024
+int drawable common_signin_btn_icon_disabled_dark 0x7f020025
+int drawable common_signin_btn_icon_disabled_focus_dark 0x7f020026
+int drawable common_signin_btn_icon_disabled_focus_light 0x7f020027
+int drawable common_signin_btn_icon_disabled_light 0x7f020028
+int drawable common_signin_btn_icon_focus_dark 0x7f020029
+int drawable common_signin_btn_icon_focus_light 0x7f02002a
+int drawable common_signin_btn_icon_light 0x7f02002b
+int drawable common_signin_btn_icon_normal_dark 0x7f02002c
+int drawable common_signin_btn_icon_normal_light 0x7f02002d
+int drawable common_signin_btn_icon_pressed_dark 0x7f02002e
+int drawable common_signin_btn_icon_pressed_light 0x7f02002f
+int drawable common_signin_btn_text_dark 0x7f020030
+int drawable common_signin_btn_text_disabled_dark 0x7f020031
+int drawable common_signin_btn_text_disabled_focus_dark 0x7f020032
+int drawable common_signin_btn_text_disabled_focus_light 0x7f020033
+int drawable common_signin_btn_text_disabled_light 0x7f020034
+int drawable common_signin_btn_text_focus_dark 0x7f020035
+int drawable common_signin_btn_text_focus_light 0x7f020036
+int drawable common_signin_btn_text_light 0x7f020037
+int drawable common_signin_btn_text_normal_dark 0x7f020038
+int drawable common_signin_btn_text_normal_light 0x7f020039
+int drawable common_signin_btn_text_pressed_dark 0x7f02003a
+int drawable common_signin_btn_text_pressed_light 0x7f02003b
+int drawable fb_layout_selection 0x7f02003c
+int drawable gmail_layout_selection 0x7f02003d
+int drawable ic_email 0x7f02003e
+int drawable ic_facebook 0x7f02003f
+int drawable ic_google 0x7f020040
+int drawable ic_help 0x7f020041
+int drawable ic_launcher 0x7f020042
+int drawable ic_location 0x7f020043
+int drawable ic_mobile 0x7f020044
+int drawable ic_otp 0x7f020045
+int drawable ic_password 0x7f020046
+int drawable ic_plusone_medium_off_client 0x7f020047
+int drawable ic_plusone_small_off_client 0x7f020048
+int drawable ic_plusone_standard_off_client 0x7f020049
+int drawable ic_plusone_tall_off_client 0x7f02004a
+int drawable ic_tab_back 0x7f02004b
+int drawable ic_tab_gboomba 0x7f02004c
+int drawable signin_btn_selecton 0x7f02004d
+int drawable splash 0x7f02004e
+int drawable tab_bg_repeatx 0x7f02004f
 int id com_facebook_login_activity_progress_bar 0x7f05000a
 int id com_facebook_picker_activity_circle 0x7f050009
 int id com_facebook_picker_checkbox 0x7f05000c

gen/com/facebook/android/R.java

@@ -52,39 +52,39 @@ public static final class dimen {
 		public static final int com_facebook_usersettingsfragment_profile_picture_width = 0x7f080002;
 	}
 	public static final class drawable {
-		public static final int com_facebook_button_blue = 0x7f020000;
-		public static final int com_facebook_button_blue_focused = 0x7f020001;
-		public static final int com_facebook_button_blue_normal = 0x7f020002;
-		public static final int com_facebook_button_blue_pressed = 0x7f020003;
-		public static final int com_facebook_button_check = 0x7f020004;
-		public static final int com_facebook_button_check_off = 0x7f020005;
-		public static final int com_facebook_button_check_on = 0x7f020006;
-		public static final int com_facebook_button_grey_focused = 0x7f020007;
-		public static final int com_facebook_button_grey_normal = 0x7f020008;
-		public static final int com_facebook_button_grey_pressed = 0x7f020009;
-		public static final int com_facebook_close = 0x7f02000a;
-		public static final int com_facebook_inverse_icon = 0x7f02000b;
-		public static final int com_facebook_list_divider = 0x7f02000c;
-		public static final int com_facebook_list_section_header_background = 0x7f02000d;
-		public static final int com_facebook_loginbutton_silver = 0x7f02000e;
-		public static final int com_facebook_logo = 0x7f02000f;
-		public static final int com_facebook_picker_default_separator_color = 0x7f02004c;
-		public static final int com_facebook_picker_item_background = 0x7f020010;
-		public static final int com_facebook_picker_list_focused = 0x7f020011;
-		public static final int com_facebook_picker_list_longpressed = 0x7f020012;
-		public static final int com_facebook_picker_list_pressed = 0x7f020013;
-		public static final int com_facebook_picker_list_selector = 0x7f020014;
-		public static final int com_facebook_picker_list_selector_background_transition = 0x7f020015;
-		public static final int com_facebook_picker_list_selector_disabled = 0x7f020016;
-		public static final int com_facebook_picker_magnifier = 0x7f020017;
-		public static final int com_facebook_picker_top_button = 0x7f020018;
-		public static final int com_facebook_place_default_icon = 0x7f020019;
-		public static final int com_facebook_profile_default_icon = 0x7f02001a;
-		public static final int com_facebook_profile_picture_blank_portrait = 0x7f02001b;
-		public static final int com_facebook_profile_picture_blank_square = 0x7f02001c;
-		public static final int com_facebook_top_background = 0x7f02001d;
-		public static final int com_facebook_top_button = 0x7f02001e;
-		public static final int com_facebook_usersettingsfragment_background_gradient = 0x7f02001f;
+		public static final int com_facebook_button_blue = 0x7f020004;
+		public static final int com_facebook_button_blue_focused = 0x7f020005;
+		public static final int com_facebook_button_blue_normal = 0x7f020006;
+		public static final int com_facebook_button_blue_pressed = 0x7f020007;
+		public static final int com_facebook_button_check = 0x7f020008;
+		public static final int com_facebook_button_check_off = 0x7f020009;
+		public static final int com_facebook_button_check_on = 0x7f02000a;
+		public static final int com_facebook_button_grey_focused = 0x7f02000b;
+		public static final int com_facebook_button_grey_normal = 0x7f02000c;
+		public static final int com_facebook_button_grey_pressed = 0x7f02000d;
+		public static final int com_facebook_close = 0x7f02000e;
+		public static final int com_facebook_inverse_icon = 0x7f02000f;
+		public static final int com_facebook_list_divider = 0x7f020010;
+		public static final int com_facebook_list_section_header_background = 0x7f020011;
+		public static final int com_facebook_loginbutton_silver = 0x7f020012;
+		public static final int com_facebook_logo = 0x7f020013;
+		public static final int com_facebook_picker_default_separator_color = 0x7f020050;
+		public static final int com_facebook_picker_item_background = 0x7f020014;
+		public static final int com_facebook_picker_list_focused = 0x7f020015;
+		public static final int com_facebook_picker_list_longpressed = 0x7f020016;
+		public static final int com_facebook_picker_list_pressed = 0x7f020017;
+		public static final int com_facebook_picker_list_selector = 0x7f020018;
+		public static final int com_facebook_picker_list_selector_background_transition = 0x7f020019;
+		public static final int com_facebook_picker_list_selector_disabled = 0x7f02001a;
+		public static final int com_facebook_picker_magnifier = 0x7f02001b;
+		public static final int com_facebook_picker_top_button = 0x7f02001c;
+		public static final int com_facebook_place_default_icon = 0x7f02001d;
+		public static final int com_facebook_profile_default_icon = 0x7f02001e;
+		public static final int com_facebook_profile_picture_blank_portrait = 0x7f02001f;
+		public static final int com_facebook_profile_picture_blank_square = 0x7f020020;
+		public static final int com_facebook_top_background = 0x7f020021;
+		public static final int com_facebook_top_button = 0x7f020022;
+		public static final int com_facebook_usersettingsfragment_background_gradient = 0x7f020023;
 	}
 	public static final class id {
 		public static final int com_facebook_login_activity_progress_bar = 0x7f05000a;