Niedzielski has uploaded a new change for review. https://gerrit.wikimedia.org/r/253032
Change subject: Remove NavigationView header layout workaround ...................................................................... Remove NavigationView header layout workaround v23.1.1 of the Support libraries has exposed NavigationView.getHeaderView(). Replace the previous workaround with a call to the new method. Change-Id: Iba3834d03432445bedbb578fcd81f4eec945a6e0 --- M app/src/main/java/org/wikipedia/page/PageActivity.java M app/src/main/res/layout/activity_page.xml 2 files changed, 2 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/32/253032/1 diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java b/app/src/main/java/org/wikipedia/page/PageActivity.java index f27f234..67b82f2 100644 --- a/app/src/main/java/org/wikipedia/page/PageActivity.java +++ b/app/src/main/java/org/wikipedia/page/PageActivity.java @@ -209,11 +209,8 @@ drawerLayout.setDrawerShadow(R.drawable.nav_drawer_shadow, GravityCompat.START); } navDrawer = (NavigationView) findViewById(R.id.navdrawer); - // TODO: replace with app:headerLayout="@layout/inflate_header_nav_drawer" attribute once - // https://code.google.com/p/android/issues/detail?id=190226 is resolved. - View navDrawerHeader = navDrawer.inflateHeaderView(R.layout.inflate_header_nav_drawer); navMenu = navDrawer.getMenu(); - navDrawerHelper = new NavDrawerHelper(this, navDrawerHeader); + navDrawerHelper = new NavDrawerHelper(this, navDrawer.getHeaderView(0)); navDrawer.setNavigationItemSelectedListener(navDrawerHelper.getNewListener()); randomHandler = navDrawerHelper.getNewRandomHandler(); diff --git a/app/src/main/res/layout/activity_page.xml b/app/src/main/res/layout/activity_page.xml index a6a1338..5e79570 100644 --- a/app/src/main/res/layout/activity_page.xml +++ b/app/src/main/res/layout/activity_page.xml @@ -169,6 +169,7 @@ android:layout_height="match_parent" android:layout_gravity="start" android:background="?attr/nav_background_color" + app:headerLayout="@layout/inflate_header_nav_drawer" app:menu="@menu/menu_nav_drawer" app:itemTextColor="?attr/nav_item_color" app:itemIconTint="?attr/nav_item_color" -- To view, visit https://gerrit.wikimedia.org/r/253032 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba3834d03432445bedbb578fcd81f4eec945a6e0 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits