diff --git a/bindings/android-sdk/android_bindings_generator.lpi b/bindings/android-sdk/android_bindings_generator.lpi
index 61ed7ad64..d067bac05 100644
--- a/bindings/android-sdk/android_bindings_generator.lpi
+++ b/bindings/android-sdk/android_bindings_generator.lpi
@@ -39,12 +39,12 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="21">
+    <Units Count="22">
       <Unit0>
         <Filename Value="android_bindings_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="android_bindings_generator"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="15" Y="14"/>
@@ -61,7 +61,7 @@
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
         <TopLine Value="6"/>
-        <CursorPos X="87" Y="47"/>
+        <CursorPos X="1" Y="51"/>
         <UsageCount Value="34"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -118,9 +118,9 @@
         <Filename Value="android_sdk_bindings_gen.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="android_sdk_bindings_gen"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="762"/>
+        <TopLine Value="761"/>
         <CursorPos X="1" Y="798"/>
         <UsageCount Value="34"/>
         <Loaded Value="True"/>
@@ -201,8 +201,8 @@
         <Filename Value="sdk_level_7/android_all.txt"/>
         <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="46"/>
-        <CursorPos X="42" Y="63"/>
+        <TopLine Value="58"/>
+        <CursorPos X="1" Y="105"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="None"/>
@@ -217,128 +217,144 @@
       </Unit19>
       <Unit20>
         <Filename Value="../../../test/androidlcl/android/src/com/pascal/androidlcl/AndroidAll.java"/>
-        <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
         <TopLine Value="365"/>
         <CursorPos X="38" Y="381"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="Java"/>
       </Unit20>
+      <Unit21>
+        <Filename Value="../../../lazarus/lcl/interfaces/lcl.pas"/>
+        <UnitName Value="LCL"/>
+        <EditorIndex Value="1"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="1"/>
+        <CursorPos X="26" Y="9"/>
+        <UsageCount Value="10"/>
+        <Loaded Value="True"/>
+      </Unit21>
     </Units>
-    <JumpHistory Count="28" HistoryIndex="27">
+    <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="641" Column="54" TopLine="637"/>
+        <Caret Line="22" Column="27" TopLine="1"/>
       </Position1>
       <Position2>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="641" Column="8" TopLine="617"/>
+        <Caret Line="60" Column="17" TopLine="31"/>
       </Position2>
       <Position3>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="22" Column="27" TopLine="1"/>
+        <Caret Line="110" Column="18" TopLine="103"/>
       </Position3>
       <Position4>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="60" Column="17" TopLine="31"/>
+        <Caret Line="375" Column="33" TopLine="343"/>
       </Position4>
       <Position5>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="110" Column="18" TopLine="103"/>
+        <Caret Line="22" Column="29" TopLine="1"/>
       </Position5>
       <Position6>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="375" Column="33" TopLine="343"/>
+        <Caret Line="23" Column="15" TopLine="1"/>
       </Position6>
       <Position7>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="22" Column="29" TopLine="1"/>
+        <Caret Line="106" Column="72" TopLine="106"/>
       </Position7>
       <Position8>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="23" Column="15" TopLine="1"/>
+        <Caret Line="212" Column="35" TopLine="184"/>
       </Position8>
       <Position9>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="106" Column="72" TopLine="106"/>
+        <Caret Line="375" Column="65" TopLine="351"/>
       </Position9>
       <Position10>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="212" Column="35" TopLine="184"/>
+        <Caret Line="374" Column="50" TopLine="351"/>
       </Position10>
       <Position11>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="375" Column="65" TopLine="351"/>
+        <Caret Line="36" Column="19" TopLine="3"/>
       </Position11>
       <Position12>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="374" Column="50" TopLine="351"/>
+        <Caret Line="689" Column="24" TopLine="664"/>
       </Position12>
       <Position13>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="36" Column="19" TopLine="3"/>
+        <Caret Line="375" Column="1" TopLine="352"/>
       </Position13>
       <Position14>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="689" Column="24" TopLine="664"/>
+        <Caret Line="40" Column="18" TopLine="3"/>
       </Position14>
       <Position15>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="375" Column="1" TopLine="352"/>
+        <Caret Line="713" Column="13" TopLine="689"/>
       </Position15>
       <Position16>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="40" Column="18" TopLine="3"/>
+        <Caret Line="41" Column="53" TopLine="3"/>
       </Position16>
       <Position17>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="713" Column="13" TopLine="689"/>
+        <Caret Line="677" Column="1" TopLine="673"/>
       </Position17>
       <Position18>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="41" Column="53" TopLine="3"/>
+        <Caret Line="153" Column="40" TopLine="134"/>
       </Position18>
       <Position19>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="677" Column="1" TopLine="673"/>
+        <Caret Line="171" Column="31" TopLine="134"/>
       </Position19>
       <Position20>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="153" Column="40" TopLine="134"/>
+        <Caret Line="385" Column="1" TopLine="370"/>
       </Position20>
       <Position21>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="171" Column="31" TopLine="134"/>
+        <Caret Line="325" Column="22" TopLine="309"/>
       </Position21>
       <Position22>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="385" Column="1" TopLine="370"/>
+        <Caret Line="727" Column="32" TopLine="722"/>
       </Position22>
       <Position23>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="325" Column="22" TopLine="309"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="38" Column="34" TopLine="1"/>
       </Position23>
       <Position24>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="727" Column="32" TopLine="722"/>
+        <Filename Value="mainform.pas"/>
+        <Caret Line="40" Column="32" TopLine="2"/>
       </Position24>
       <Position25>
         <Filename Value="mainform.pas"/>
-        <Caret Line="38" Column="34" TopLine="1"/>
+        <Caret Line="48" Column="62" TopLine="2"/>
       </Position25>
       <Position26>
         <Filename Value="mainform.pas"/>
-        <Caret Line="40" Column="32" TopLine="2"/>
+        <Caret Line="49" Column="15" TopLine="5"/>
       </Position26>
       <Position27>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="48" Column="62" TopLine="2"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="63" Column="42" TopLine="51"/>
       </Position27>
       <Position28>
-        <Filename Value="mainform.pas"/>
-        <Caret Line="49" Column="15" TopLine="5"/>
+        <Filename Value="../../../lazarus/lcl/interfaces/lcl.pas"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position28>
+      <Position29>
+        <Filename Value="../../../lazarus/lcl/interfaces/lcl.pas"/>
+        <Caret Line="10" Column="1" TopLine="1"/>
+      </Position29>
+      <Position30>
+        <Filename Value="../../../lazarus/lcl/interfaces/lcl.pas"/>
+        <Caret Line="20" Column="81" TopLine="1"/>
+      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/bindings/android-sdk/mainform.pas b/bindings/android-sdk/mainform.pas
index caacc879d..b175cb040 100644
--- a/bindings/android-sdk/mainform.pas
+++ b/bindings/android-sdk/mainform.pas
@@ -47,6 +47,9 @@ begin
   lSourcePath := IncludeTrailingPathDelimiter(editInputPath.Text) + 'android_all.pas';
   lDestPath := '/home/felipe/Programas/lazarus/lcl/interfaces/android/android_all.pas';
   FileUtil.CopyFile(lSourcePath, lDestPath);
+  lSourcePath := IncludeTrailingPathDelimiter(editInputPath.Text) + 'AndroidAll.java';
+  lDestPath := '/home/felipe/Programas/lazarus-ccr/examples/androidlcl/android/src/com/pascal/androidlcl/AndroidAll.java';
+  FileUtil.CopyFile(lSourcePath, lDestPath);
 end;
 
 end.
diff --git a/bindings/android-sdk/sdk_level_7/android_all.txt b/bindings/android-sdk/sdk_level_7/android_all.txt
index c068f1a1e..792140067 100644
--- a/bindings/android-sdk/sdk_level_7/android_all.txt
+++ b/bindings/android-sdk/sdk_level_7/android_all.txt
@@ -96,3 +96,10 @@ method void 	toggle()
 [CheckBox] CompoundButton
 constructor Create(Activity)
 
+[AdapterView] ViewGroup
+
+[AbsSpinner] AdapterView
+
+[Spinner] AbsSpinner
+constructor Create(Activity);
+