diff options
| author | Andrew Solovay <asolovay@google.com> | 2015-03-19 01:49:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-19 01:49:00 +0000 |
| commit | 164dd96eec5369652594c560e076bcf12e6416f7 (patch) | |
| tree | 30fbc16db51ab3b41075a12f31931006ce32fad0 /docs/html | |
| parent | 1bed39a5e4d57e4735e72a1e9765dcec62035b40 (diff) | |
| parent | 118915706ea9f52e503bc82bf616da438eaad65e (diff) | |
| download | frameworks_base-164dd96eec5369652594c560e076bcf12e6416f7.zip frameworks_base-164dd96eec5369652594c560e076bcf12e6416f7.tar.gz frameworks_base-164dd96eec5369652594c560e076bcf12e6416f7.tar.bz2 | |
am 11891570: am 006d7512: am a0141748: am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs
* commit '118915706ea9f52e503bc82bf616da438eaad65e':
docs: Fixed broken image link, and broke long lines in code samples
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/guide/topics/ui/layout/grid.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/layout/gridview.jd | 9 |
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 c2f1321..3474f48 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 a4bf224..13467ae 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<?> parent, View v, int position, long id) { - Toast.makeText(HelloGridView.this, "" + position, Toast.LENGTH_SHORT).show(); + public void onItemClick(AdapterView<?> 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); |
