[Remoting Android] Separate help and feedback in navigation drawer

remoting/android/java/src/org/chromium/chromoting/Chromoting.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chromoting;
 
 import android.annotation.SuppressLint;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ skipping 15 matching lines @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.Log;
-import org.chromium.chromoting.NavigationMenuAdapter.NavigationMenuItem;
 import org.chromium.chromoting.accountswitcher.AccountSwitcher;
 import org.chromium.chromoting.accountswitcher.AccountSwitcherFactory;
 import org.chromium.chromoting.base.OAuthTokenFetcher;
-import org.chromium.chromoting.help.CreditsActivity;
 import org.chromium.chromoting.help.HelpContext;
 import org.chromium.chromoting.help.HelpSingleton;
 import org.chromium.chromoting.jni.Client;
 import org.chromium.chromoting.jni.ConnectionListener;
 import org.chromium.chromoting.jni.JniInterface;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
 /**
@@ skipping 111 matching lines @@
      * Shows the appropriate view for the host list and hides the loading indicator. Shows either
      * the host list chooser or the host list empty view, depending on whether mHosts contains any
      * hosts.
      */
     private void updateHostListView() {
         mHostListView.setVisibility(mHosts.length == 0 ? View.GONE : View.VISIBLE);
         mEmptyView.setVisibility(mHosts.length == 0 ? View.VISIBLE : View.GONE);
         mProgressView.setVisibility(View.GONE);
     }
 
-    private ListView createNavigationMenu() {
-        ListView navigationMenu = (ListView) getLayoutInflater()
-                .inflate(R.layout.navigation_list, null);
-
-        NavigationMenuItem helpItem = new NavigationMenuItem(R.menu.help_list_item,
-                new Runnable() {
-                    @Override
-                    public void run() {
-                        HelpSingleton.getInstance().launchHelp(Chromoting.this,
-                                HelpContext.HOST_LIST);
-                    }
-                });
-
-        NavigationMenuItem creditsItem = new NavigationMenuItem(R.menu.credits_list_item,
-                new Runnable() {
-                    @Override
-                    public void run() {
-                        startActivity(new Intent(Chromoting.this, CreditsActivity.class));
-                    }
-                });
-
-        NavigationMenuItem[] navigationMenuItems = { helpItem, creditsItem };
-        NavigationMenuAdapter adapter = new NavigationMenuAdapter(this, navigationMenuItems);
-        navigationMenu.setAdapter(adapter);
-        navigationMenu.setOnItemClickListener(adapter);
-        return navigationMenu;
-    }
-
     /**
      * Called when the activity is first created. Loads the native library and requests an
      * authentication token from the system.
      */
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
@@ skipping 51 matching lines @@
                 });
 
         // Set the three-line icon instead of the default which is a tinted arrow icon.
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         Drawable menuIcon = ApiCompatibilityUtils.getDrawable(getResources(), R.drawable.ic_menu);
         DrawableCompat.setTint(menuIcon.mutate(),
                 ChromotingUtil.getColorAttribute(this, R.attr.colorControlNormal));
         getSupportActionBar().setHomeAsUpIndicator(menuIcon);
 
         mAccountSwitcher = AccountSwitcherFactory.getInstance().createAccountSwitcher(this, this);
-        mAccountSwitcher.setNavigation(createNavigationMenu());
+        mAccountSwitcher.setNavigation(NavigationMenuAdapter.createNavigationMenu(this));
         LinearLayout navigationDrawer = (LinearLayout) findViewById(R.id.navigation_drawer);
         mAccountSwitcher.setDrawer(navigationDrawer);
         View switcherView = mAccountSwitcher.getView();
         switcherView.setLayoutParams(new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT));
         navigationDrawer.addView(switcherView, 0);
 
         mHostConnectingConsumer = new OAuthTokenConsumer(this, TOKEN_SCOPE);
         mHostListRetrievingConsumer = new OAuthTokenConsumer(this, TOKEN_SCOPE);
@@ skipping 423 matching lines @@
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         if (dismissProgress && mProgressIndicator != null) {
             mProgressIndicator.dismiss();
             mProgressIndicator = null;
         }
     }
 }