am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs

* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples

2 files changed, 7 insertions, 4 deletions

diff --git a/docs/html/guide/topics/ui/layout/grid.jd b/docs/html/guide/topics/ui/layout/grid.jd
index c2f13215f064..3474f48c9d86 100644
--- a/docs/html/guide/topics/ui/layout/grid.jd
+++ b/docs/html/guide/topics/ui/layout/grid.jd
@@ -181,7 +181,7 @@ file.</p>
 <li>Run the application.</li>
 </ol>
 <p>You should see the following:</p>
-<img src="images/hello-tablelayout.png" width="150px" />
+<img src="{@docRoot}guide/topics/ui/images/hello-tablelayout.png" width="150px" />
 
 
 
diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd
index a4bf2244689b..13467ae17245 100644
--- a/docs/html/guide/topics/ui/layout/gridview.jd
+++ b/docs/html/guide/topics/ui/layout/gridview.jd
@@ -70,8 +70,10 @@ public void onCreate(Bundle savedInstanceState) {
     gridview.setAdapter(new ImageAdapter(this));
 
     gridview.setOnItemClickListener(new OnItemClickListener() {
-        public void onItemClick(AdapterView&lt;?> parent, View v, int position, long id) {
-            Toast.makeText(HelloGridView.this, "" + position, Toast.LENGTH_SHORT).show();
+        public void onItemClick(AdapterView&lt;?> parent, View v,
+                int position, long id) {
+            Toast.makeText(HelloGridView.this, "" + position,
+                    Toast.LENGTH_SHORT).show();
         }
     });
 }
@@ -118,7 +120,8 @@ public class ImageAdapter extends BaseAdapter {
     // create a new ImageView for each item referenced by the Adapter
     public View getView(int position, View convertView, ViewGroup parent) {
         ImageView imageView;
-        if (convertView == null) {  // if it's not recycled, initialize some attributes
+        if (convertView == null) {
+            // if it's not recycled, initialize some attributes
             imageView = new ImageView(mContext);
             imageView.setLayoutParams(new GridView.LayoutParams(85, 85));
             imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);