diff --git a/bindings/android-sdk/android_bindings_generator.lpi b/bindings/android-sdk/android_bindings_generator.lpi
index d067bac05..387253b6b 100644
--- a/bindings/android-sdk/android_bindings_generator.lpi
+++ b/bindings/android-sdk/android_bindings_generator.lpi
@@ -57,7 +57,6 @@
         <ComponentName Value="Form1"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="mainform"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
         <TopLine Value="6"/>
@@ -118,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="761"/>
-        <CursorPos X="1" Y="798"/>
+        <TopLine Value="560"/>
+        <CursorPos X="28" Y="574"/>
         <UsageCount Value="34"/>
         <Loaded Value="True"/>
       </Unit8>
@@ -201,8 +201,8 @@
         <Filename Value="sdk_level_7/android_all.txt"/>
         <EditorIndex Value="4"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="58"/>
-        <CursorPos X="1" Y="105"/>
+        <TopLine Value="27"/>
+        <CursorPos X="1" Y="38"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="None"/>
diff --git a/bindings/android-sdk/android_sdk_bindings_gen.pas b/bindings/android-sdk/android_sdk_bindings_gen.pas
index 6e4ba0e5d..02353c448 100644
--- a/bindings/android-sdk/android_sdk_bindings_gen.pas
+++ b/bindings/android-sdk/android_sdk_bindings_gen.pas
@@ -15,7 +15,8 @@ type
   private
     FSourceFile: TStringList;
     FPasOutputTypes, FPasOutputClassesForward, FPasOutputClasses,
-      FPasOutputConsts, FPasOutputIDs, FPasOutputImpl, FPasOutputMessages: TStringList;
+      FPasOutputConsts, FPasOutputIDs, FPasOutputImpl, FPasOutputMessages,
+      FPasOutputInterfaceConsts: TStringList;
     FJavaOutputIDs, FJavaOutputMethods: TStringList;
     FClassName, FClassNamePas: string; // Class name of the class currently being parsed
     FClassNum, FMethodNum: Integer;
@@ -75,12 +76,16 @@ begin
   ADest.AddStrings(FPasOutputClasses);
   ADest.Add('  end;');
   ADest.Add('');
+  ADest.Add('const');
+  ADest.Add('  { Interface Constants }');
+  ADest.AddStrings(FPasOutputInterfaceConsts);
+  ADest.Add('');
   ADest.Add('function HandleMessage(AFirstInt: Integer): Boolean;');
   ADest.Add('');
   ADest.Add('implementation');
   ADest.Add('');
   ADest.Add('const');
-  ADest.Add('  { Constants }');
+  ADest.Add('  { Implementation Constants }');
   ADest.Add('');
   ADest.AddStrings(FPasOutputConsts);
   ADest.Add('');
@@ -566,7 +571,7 @@ begin
   lConstValue := GetNextWord(ASourceLine, lReaderPos);
 
   // Method type and name
-  FPasOutputConsts.Add(Format('  %s = %s;', [lConstName, lConstValue]));
+  FPasOutputInterfaceConsts.Add(Format('  %s = %s;', [lConstName, lConstValue]));
 end;
 
 // callbacksettercaller setOnClickListener callOnClickListener OnClickCallback = procedure (v: TView) of object;
@@ -764,6 +769,7 @@ begin
   FPasOutputIDs := TStringList.Create;
   FPasOutputConsts := TStringList.Create;
   FPasOutputMessages := TStringList.Create;
+  FPasOutputInterfaceConsts := TStringList.Create;
 
   FJavaOutputIDs := TStringList.Create;
   FJavaOutputMethods := TStringList.Create;
@@ -782,6 +788,7 @@ begin
   FPasOutputIDs.Free;
   FPasOutputConsts.Free;
   FPasOutputMessages.Free;
+  FPasOutputInterfaceConsts.Free;
 
   FJavaOutputIDs.Free;
   FJavaOutputMethods.Free;
diff --git a/bindings/android-sdk/sdk_level_7/android_all.txt b/bindings/android-sdk/sdk_level_7/android_all.txt
index 792140067..6ebcb66d1 100644
--- a/bindings/android-sdk/sdk_level_7/android_all.txt
+++ b/bindings/android-sdk/sdk_level_7/android_all.txt
@@ -33,6 +33,8 @@ method Display getDefaultDisplay()
 [ViewGroup.LayoutParams] TJavaObject
 constructor Create(int width, int height);
 const FILL_PARENT = $FFFFFFFF;
+const MATCH_PARENT = $FFFFFFFF;
+const WRAP_CONTENT = $FFFFFFFE;
 
 [View] TJavaObject
 method void setLayoutParams(ViewGroup.LayoutParams params);