Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2f13044 authored by Andrew Solovay's avatar Andrew Solovay Committed by Android (Google) Code Review
Browse files

Merge "docs: Quick formatting fixes" into mnc-docs

parents 8fe1f437 6b5a4d63

docs/html/training/improving-layouts/reusing-layouts.jd

+21 −21
Original line number Diff line number Diff line
@@ -56,14 +56,14 @@ included in each activity (<code>titlebar.xml</code>):</p> 


<pre>

&lt;FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width=”match_parent”

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="&#64;color/titlebar_bg">



    &lt;ImageView android:layout_width="wrap_content"

               android:layout_height="wrap_content"

               android:src="&#64;drawable/gafricalogo" />

&lt;/FrameLayout>

               android:src="&#64;drawable/gafricalogo" /&gt;

&lt;/FrameLayout&gt;

</pre>



<p>The root {@link android.view.View} should be exactly how you'd like it to appear in each
@@ -81,17 +81,17 @@ G-Kenya codelab that includes the title bar from above:</p> 
<pre>

&lt;LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width=”match_parent”

    android:layout_height=”match_parent”

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="&#64;color/app_bg"

    android:gravity="center_horizontal">

    android:gravity="center_horizontal"&gt;



    <strong>&lt;include layout="&#64;layout/titlebar"/></strong>

    <strong>&lt;include layout="&#64;layout/titlebar"/&gt;</strong>



    &lt;TextView android:layout_width=”match_parent”

    &lt;TextView android:layout_width="match_parent"

              android:layout_height="wrap_content"

              android:text="&#64;string/hello"

              android:padding="10dp" />

              android:padding="10dp" /&gt;



    ...
@@ -103,10 +103,10 @@ included layout's root view by specifying them in the {@code &lt;include/&gt;} t 
example:</p>



<pre>

&lt;include android:id=”&#64;+id/news_title”

         android:layout_width=”match_parent”

         android:layout_height=”match_parent”

         layout=”@layout/title”/>

&lt;include android:id="&#64;+id/news_title"

         android:layout_width="match_parent"

         android:layout_height="match_parent"

         layout="@layout/title"/&gt;

</pre>



<p>However, if you want to override layout attributes using
@@ -130,17 +130,17 @@ serves no real purpose other than to slow down your UI performance.</p> 
{@code &lt;merge&gt;} element as the root view for the re-usable layout. For example:</p>



<pre>

&lt;merge xmlns:android="http://schemas.android.com/apk/res/android">

&lt;merge xmlns:android="http://schemas.android.com/apk/res/android"&gt;



    &lt;Button

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:text="@string/add"/>

        android:text="@string/add"/&gt;



    &lt;Button

        android:layout_width="fill_parent"

        android:layout_height="wrap_content"

        android:text="@string/delete"/>

        android:text="@string/delete"/&gt;



&lt;/merge>

</pre>