From e8ac210962d7c622b151fb1e8dc2b68e9469f6d8 Mon Sep 17 00:00:00 2001
From: Kirill Grouchnikov <kirillg@google.com>
Date: Thu, 3 Dec 2015 17:56:37 -0500
Subject: [PATCH] Fix drawer layout sample app layout issue.

On GB and older devices FrameLayout has a bug that makes it
incorrectly treat margins when gravity is not specified.

Bug: 26002719
Change-Id: Ib3deaf8a6cebe3430bf017208bee8c0b956ea430
---
 samples/Support7Demos/res/layout/drawer_layout.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/samples/Support7Demos/res/layout/drawer_layout.xml b/samples/Support7Demos/res/layout/drawer_layout.xml
index c110af75f..1a72b06f5 100644
--- a/samples/Support7Demos/res/layout/drawer_layout.xml
+++ b/samples/Support7Demos/res/layout/drawer_layout.xml
@@ -40,11 +40,14 @@
                 android:layout_height="wrap_content" />
         <!-- Note layout_marginTop attribute with action bar height as the value.
              This "pushes" down the main content so that it doesn't overlap with
-             the toolbar. -->
+             the toolbar. Note the usage of layout_gravity that addresses a bug in
+             FrameLayout on v9 and older devices that didn't correctly treat the
+             margin attributes. -->
         <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginTop="?attr/actionBarSize"
+                android:layout_gravity="top"
                 android:scrollbarStyle="outsideOverlay">
             <TextView
                     android:id="@+id/content_text"