diff --git a/bindings/android-sdk/android_bindings_generator.lpi b/bindings/android-sdk/android_bindings_generator.lpi
index addeb92ef..36673953f 100644
--- a/bindings/android-sdk/android_bindings_generator.lpi
+++ b/bindings/android-sdk/android_bindings_generator.lpi
@@ -117,10 +117,11 @@
         <Filename Value="android_sdk_bindings_gen.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="android_sdk_bindings_gen"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="3"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="162"/>
-        <CursorPos X="32" Y="176"/>
+        <TopLine Value="84"/>
+        <CursorPos X="30" Y="123"/>
         <UsageCount Value="38"/>
         <Loaded Value="True"/>
       </Unit8>
@@ -200,8 +201,8 @@
         <Filename Value="sdk_level_7/android_all.txt"/>
         <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="99"/>
-        <CursorPos X="25" Y="145"/>
+        <TopLine Value="129"/>
+        <CursorPos X="47" Y="152"/>
         <UsageCount Value="12"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="None"/>
@@ -243,10 +244,9 @@
       <Unit23>
         <Filename Value="../../../lazarus/lcl/interfaces/android/android_all.pas"/>
         <UnitName Value="android_all"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="654"/>
+        <TopLine Value="682"/>
         <CursorPos X="1" Y="682"/>
         <UsageCount Value="12"/>
         <Loaded Value="True"/>
@@ -277,119 +277,119 @@
       </Position1>
       <Position2>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="777" Column="49" TopLine="737"/>
+        <Caret Line="40" Column="36" TopLine="8"/>
       </Position2>
       <Position3>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="826" Column="47" TopLine="786"/>
+        <Caret Line="836" Column="33" TopLine="835"/>
       </Position3>
       <Position4>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="835" Column="67" TopLine="795"/>
+        <Caret Line="40" Column="48" TopLine="40"/>
       </Position4>
       <Position5>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="2" Column="5" TopLine="1"/>
+        <Caret Line="41" Column="58" TopLine="3"/>
       </Position5>
       <Position6>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="57" Column="25" TopLine="17"/>
+        <Caret Line="321" Column="29" TopLine="304"/>
       </Position6>
       <Position7>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="76" Column="28" TopLine="41"/>
       </Position7>
       <Position8>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="40" Column="36" TopLine="8"/>
+        <Caret Line="582" Column="99" TopLine="507"/>
       </Position8>
       <Position9>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="836" Column="33" TopLine="835"/>
+        <Caret Line="524" Column="1" TopLine="507"/>
       </Position9>
       <Position10>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="40" Column="48" TopLine="40"/>
+        <Caret Line="525" Column="1" TopLine="507"/>
       </Position10>
       <Position11>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="41" Column="58" TopLine="3"/>
+        <Caret Line="528" Column="1" TopLine="507"/>
       </Position11>
       <Position12>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="321" Column="29" TopLine="304"/>
+        <Caret Line="529" Column="1" TopLine="507"/>
       </Position12>
       <Position13>
-        <Filename Value="sdk_level_7/android_all.txt"/>
-        <Caret Line="76" Column="28" TopLine="41"/>
+        <Filename Value="android_sdk_bindings_gen.pas"/>
+        <Caret Line="532" Column="1" TopLine="507"/>
       </Position13>
       <Position14>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="582" Column="99" TopLine="507"/>
+        <Caret Line="535" Column="1" TopLine="507"/>
       </Position14>
       <Position15>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="524" Column="1" TopLine="507"/>
+        <Caret Line="539" Column="1" TopLine="507"/>
       </Position15>
       <Position16>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="525" Column="1" TopLine="507"/>
+        <Caret Line="541" Column="1" TopLine="507"/>
       </Position16>
       <Position17>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="528" Column="1" TopLine="507"/>
+        <Caret Line="542" Column="36" TopLine="526"/>
       </Position17>
       <Position18>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="529" Column="1" TopLine="507"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="145" Column="23" TopLine="99"/>
       </Position18>
       <Position19>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="532" Column="1" TopLine="507"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position19>
       <Position20>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="535" Column="1" TopLine="507"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="143" Column="21" TopLine="99"/>
       </Position20>
       <Position21>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="539" Column="1" TopLine="507"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="145" Column="23" TopLine="99"/>
       </Position21>
       <Position22>
         <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="541" Column="1" TopLine="507"/>
+        <Caret Line="42" Column="20" TopLine="3"/>
       </Position22>
       <Position23>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="542" Column="36" TopLine="526"/>
+        <Filename Value="../../../lazarus/lcl/interfaces/android/android_all.pas"/>
+        <Caret Line="666" Column="17" TopLine="653"/>
       </Position23>
       <Position24>
-        <Filename Value="sdk_level_7/android_all.txt"/>
-        <Caret Line="145" Column="23" TopLine="99"/>
+        <Filename Value="android_sdk_bindings_gen.pas"/>
+        <Caret Line="864" Column="22" TopLine="858"/>
       </Position24>
       <Position25>
         <Filename Value="sdk_level_7/android_all.txt"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Caret Line="150" Column="1" TopLine="103"/>
       </Position25>
       <Position26>
         <Filename Value="sdk_level_7/android_all.txt"/>
-        <Caret Line="143" Column="21" TopLine="99"/>
+        <Caret Line="42" Column="1" TopLine="1"/>
       </Position26>
       <Position27>
         <Filename Value="sdk_level_7/android_all.txt"/>
-        <Caret Line="145" Column="23" TopLine="99"/>
+        <Caret Line="151" Column="1" TopLine="108"/>
       </Position27>
       <Position28>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="42" Column="20" TopLine="3"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position28>
       <Position29>
-        <Filename Value="../../../lazarus/lcl/interfaces/android/android_all.pas"/>
-        <Caret Line="666" Column="17" TopLine="653"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="37" Column="1" TopLine="14"/>
       </Position29>
       <Position30>
-        <Filename Value="android_sdk_bindings_gen.pas"/>
-        <Caret Line="864" Column="22" TopLine="858"/>
+        <Filename Value="sdk_level_7/android_all.txt"/>
+        <Caret Line="267" Column="1" TopLine="220"/>
       </Position30>
     </JumpHistory>
   </ProjectOptions>
diff --git a/bindings/android-sdk/android_sdk_bindings_gen.pas b/bindings/android-sdk/android_sdk_bindings_gen.pas
index 09ed33adf..6a8c4acf3 100644
--- a/bindings/android-sdk/android_sdk_bindings_gen.pas
+++ b/bindings/android-sdk/android_sdk_bindings_gen.pas
@@ -120,6 +120,7 @@ begin
   ADest.Add('import android.content.*;');
   ADest.Add('import android.view.*;');
   ADest.Add('import android.widget.*;');
+  ADest.Add('import android.R.*;');
   ADest.Add('import java.util.*;');
   ADest.Add('import java.lang.*;');
   ADest.Add('');
diff --git a/bindings/android-sdk/sdk_level_7/android_all.txt b/bindings/android-sdk/sdk_level_7/android_all.txt
index 3f6510092..d24f322c9 100644
--- a/bindings/android-sdk/sdk_level_7/android_all.txt
+++ b/bindings/android-sdk/sdk_level_7/android_all.txt
@@ -144,3 +144,33 @@ constructor Create(Activity);
 constructor Create(Activity, int textViewResourceId)
 method void add(String aobject)
 
+#
+# android.R.layout
+#
+[layout] TJavaObject
+const activity_list_item = $01090000;
+const browser_link_context_header = $0109000e;
+const expandable_list_content = $01090001;
+const list_content = $01090014;
+const preference_category = $01090002;
+const select_dialog_item = $01090011;
+const select_dialog_multichoice = $01090013;
+const select_dialog_singlechoice = $01090012;
+const simple_dropdown_item_1line = $0109000a;
+const simple_expandable_list_item_1 = $01090006;
+const simple_expandable_list_item_2 = $01090007;
+const simple_gallery_item = $0109000b;
+const simple_list_item_1 = $01090003;
+const simple_list_item_2 = $01090004;
+const simple_list_item_activated_1 = $01090016;
+const simple_list_item_activated_2 = $01090017;
+const simple_list_item_checked = $01090005;
+const simple_list_item_multiple_choice = $01090010;
+const simple_list_item_single_choice = $0109000f;
+const simple_selectable_list_item = $01090015;
+const simple_spinner_dropdown_item = $01090009;
+const simple_spinner_item = $01090008;
+const test_list_item = $0109000c;
+const two_line_list_item = $0109000d;
+
+