Merge pull request #17 from pratik-ijoomer/master

Adding updated version 1.5

FacebookSDK/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

FacebookSDK/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
- * Copyright (C) 2010 Facebook Inc.
+ * Copyright 2010-present Facebook.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

FacebookSDK/project.properties

@@ -12,4 +12,5 @@
 
 android.library=true
 # Project target.
-target=android-8
+target=android-18
+android.library.reference.1=../android-maps-extensions

FacebookSDK/res/drawable/com_facebook_button_blue.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+      android:drawable="@drawable/com_facebook_button_blue_pressed"
+      android:state_focused="true"
+      android:state_pressed="true"
+      />
+  <item
+      android:drawable="@drawable/com_facebook_button_blue_pressed"
+      android:state_focused="false"
+      android:state_pressed="true"
+      />
+  <item
+      android:drawable="@drawable/com_facebook_button_blue_focused"
+      android:state_focused="true"
+      />
+  <item
+      android:drawable="@drawable/com_facebook_button_blue_normal"
+      android:state_focused="false"
+      android:state_pressed="false"
+      />
+
+</selector>

FacebookSDK/res/drawable/com_facebook_button_check.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/drawable/com_facebook_loginbutton_silver.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/drawable/com_facebook_picker_item_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/drawable/com_facebook_picker_list_selector.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/drawable/com_facebook_picker_top_button.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/drawable/com_facebook_top_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/drawable/com_facebook_top_button.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/drawable/com_facebook_usersettingsfragment_background_gradient.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_friendpickerfragment.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -32,7 +32,6 @@
             android:listSelector="@drawable/com_facebook_picker_list_selector"
             android:cacheColorHint="#FFFFFF"
             />
-
     <ProgressBar android:indeterminate="true"
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"

FacebookSDK/res/layout/com_facebook_picker_activity_circle_row.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_picker_checkbox.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_picker_image.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_picker_list_row.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_picker_list_section_header.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_picker_search_box.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,7 +15,15 @@
     limitations under the License.
 -->
 
-<EditText xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="wrap_content"
-              android:layout_height="fill_parent">
-</EditText>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+        >
+    <include layout="@layout/com_facebook_search_bar_layout" />
+    <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/com_facebook_picker_divider_width"
+            android:background="@drawable/com_facebook_picker_default_separator_color"
+            />
+</LinearLayout>

FacebookSDK/res/layout/com_facebook_picker_title_bar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_picker_title_bar_stub.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

FacebookSDK/res/layout/com_facebook_placepickerfragment.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -24,18 +24,12 @@
 
     <include layout="@layout/com_facebook_picker_title_bar_stub"/>
 
-    <ViewStub android:id="@+id/com_facebook_placepickerfragment_search_box_stub"
-              android:inflatedId="@+id/search_box"
-              android:layout="@layout/com_facebook_picker_search_box"
-              android:layout_height="wrap_content"
-              android:layout_width="fill_parent"/>
-
     <ListView
             android:id="@+id/com_facebook_picker_list_view"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_alignParentTop="true"
-            android:divider="@drawable/com_facebook_list_divider"
+            android:divider="@null"
             android:fastScrollEnabled="true"
             android:scrollbars="vertical"
             android:listSelector="@drawable/com_facebook_picker_list_selector"

FacebookSDK/res/layout/com_facebook_placepickerfragment_list_row.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright 2012 Facebook
+    Copyright 2010-present Facebook.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,56 +15,76 @@
     limitations under the License.
 -->
 
-<LinearLayout
+<RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent">
-    <ViewStub
-            android:id="@+id/com_facebook_picker_profile_pic_stub"
-            android:inflatedId="@+id/com_facebook_picker_image"
-            android:layout="@layout/com_facebook_picker_image"
-            android:layout_width="50dip"
-            android:layout_height="50dip" />
+        android:layout_width="match_parent"
+        android:focusable="false">
     <LinearLayout
-            android:orientation="vertical"
-            android:focusable="false"
-            android:layout_width="0dip"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginRight="16dp"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1">
-        <TextView
-                android:id="@+id/com_facebook_picker_title"
-                android:layout_width="fill_parent"
+            android:orientation="horizontal"
+            android:focusable="false"
+            >
+        <FrameLayout
+                android:layout_width="80dp"
                 android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:paddingLeft="5dip"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:typeface="sans"
-                android:textColor="#000000"
-                android:lines="1"
-                android:textSize="16sp"
-                android:gravity="left|center_vertical"/>
-        <TextView
-                android:id="@+id/picker_subtitle"
-                android:layout_width="fill_parent"
+                >
+            <ViewStub
+                    android:id="@+id/com_facebook_picker_profile_pic_stub"
+                    android:inflatedId="@+id/com_facebook_picker_image"
+                    android:layout="@layout/com_facebook_picker_image"
+                    android:layout_gravity="left|center_vertical"
+                    android:layout_width="@dimen/com_facebook_picker_place_image_size"
+                    android:layout_height="@dimen/com_facebook_picker_place_image_size" />
+        </FrameLayout>
+        <LinearLayout
+                android:orientation="vertical"
+                android:focusable="false"
+                android:layout_width="0dip"
                 android:layout_height="wrap_content"
-                android:layout_weight="1.0"
-                android:paddingLeft="5dip"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="#666666"
-                android:lines="1"
-                android:typeface="sans"
-                android:textSize="12sp"
-                android:gravity="left|center_vertical"/>
+                android:layout_marginRight="16dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1">
+            <TextView
+                    android:id="@+id/com_facebook_picker_title"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:typeface="sans"
+                    android:textColor="#000000"
+                    android:lines="1"
+                    android:textSize="16sp"
+                    android:gravity="left|center_vertical"/>
+            <TextView
+                    android:id="@+id/picker_subtitle"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1.0"
+                    android:ellipsize="end"
+                    android:singleLine="true"
+                    android:textColor="#666666"
+                    android:lines="1"
+                    android:typeface="sans"
+                    android:textSize="12sp"
+                    android:gravity="left|center_vertical"/>
+        </LinearLayout>
+        <!--ViewStub
+                android:id="@+id/checkbox_stub"
+                android:inflatedId="@+id/picker_checkbox"
+                android:layout="@layout/checkbox_layout"
+                android:layout_width="23dip"
+                android:layout_height="23dip"
+                android:layout_marginRight="10dip"/-->
     </LinearLayout>
-    <!--ViewStub
-            android:id="@+id/checkbox_stub"
-            android:inflatedId="@+id/picker_checkbox"
-            android:layout="@layout/checkbox_layout"
-            android:layout_width="23dip"
-            android:layout_height="23dip"
-            android:layout_marginRight="10dip"/-->
-</LinearLayout>
+    <View
+            android:layout_width="0dp"
+            android:layout_height="@dimen/com_facebook_picker_divider_width"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentBottom="true"
+            android:background="@drawable/com_facebook_picker_default_separator_color"
+            />
+</RelativeLayout>