summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-07-19 13:33:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-07-19 13:33:58 -0700
commit1cf7b4a438a01d2c018699e38332965b366f479c (patch)
treee84ea161a5ba44150ca8348e5babe6097593f20c
parent46cc4dbb38968dadffcc5f78dd69d391768711e1 (diff)
parentd3ed45f841419b90e1d6813d9bcefbcb91554a63 (diff)
downloadframeworks_base-1cf7b4a438a01d2c018699e38332965b366f479c.zip
frameworks_base-1cf7b4a438a01d2c018699e38332965b366f479c.tar.gz
frameworks_base-1cf7b4a438a01d2c018699e38332965b366f479c.tar.bz2
am d3ed45f8: am 991487c6: am 9a1f106d: am 34a1fa43: Merge "fix typo in code sample" into jb-mr1.1-ub-dev
* commit 'd3ed45f841419b90e1d6813d9bcefbcb91554a63': fix typo in code sample
-rw-r--r--docs/html/training/implementing-navigation/nav-drawer.jd6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/html/training/implementing-navigation/nav-drawer.jd b/docs/html/training/implementing-navigation/nav-drawer.jd
index 527d570..38b7345 100644
--- a/docs/html/training/implementing-navigation/nav-drawer.jd
+++ b/docs/html/training/implementing-navigation/nav-drawer.jd
@@ -124,6 +124,7 @@ android.widget.ArrayAdapter} or {@link android.widget.SimpleCursorAdapter}).</p>
<pre>
public class MainActivity extends Activity {
private String[] mPlanetTitles;
+ private DrawerLayout mDrawerLayout;
private ListView mDrawerList;
...
@@ -133,6 +134,7 @@ public class MainActivity extends Activity {
setContentView(R.layout.activity_main);
mPlanetTitles = getResources().getStringArray(R.array.planets_array);
+ mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
mDrawerList = (ListView) findViewById(R.id.left_drawer);
// Set the adapter for the list view
@@ -191,9 +193,9 @@ private void selectItem(int position) {
.commit();
// Highlight the selected item, update the title, and close the drawer
- mDrawer.setItemChecked(position, true);
+ mDrawerList.setItemChecked(position, true);
setTitle(mPlanetTitles[position]);
- mDrawerLayout.closeDrawer(mDrawer);
+ mDrawerLayout.closeDrawer(mDrawerList);
}
&#64;Override