diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:59:01 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-27 21:59:01 +0000 |
| commit | aad9b4ad9130672ad280b2e4f40799a6e2e00e74 (patch) | |
| tree | 7d5d150225fadeafefd9fe3f506ed30b7fa0393a /remoting/android | |
| parent | 559a507a3383346f652d1a70a76bf41d0be9c28e (diff) | |
| download | chromium_src-aad9b4ad9130672ad280b2e4f40799a6e2e00e74.zip chromium_src-aad9b4ad9130672ad280b2e4f40799a6e2e00e74.tar.gz chromium_src-aad9b4ad9130672ad280b2e4f40799a6e2e00e74.tar.bz2 | |
Android Chromoting: Fully set action-bar state in onStart()
This fixes both the title and spinner being shown if you add a second
account to the device, then switch back to the Chromoting app.
NOTRY=true
R=jamiewalch@chromium.org
Review URL: https://codereview.chromium.org/214683006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/android')
| -rw-r--r-- | remoting/android/java/src/org/chromium/chromoting/Chromoting.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java index d89b92c..1e8b489 100644 --- a/remoting/android/java/src/org/chromium/chromoting/Chromoting.java +++ b/remoting/android/java/src/org/chromium/chromoting/Chromoting.java @@ -191,10 +191,12 @@ public class Chromoting extends Activity implements JniInterface.ConnectionListe if (mAccounts.length == 1) { getActionBar().setDisplayShowTitleEnabled(true); + getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD); getActionBar().setTitle(R.string.mode_me2me); getActionBar().setSubtitle(mAccount.name); } else { mAccountsAdapter = new AccountsAdapter(this, mAccounts); + getActionBar().setDisplayShowTitleEnabled(false); getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); getActionBar().setListNavigationCallbacks(mAccountsAdapter, this); getActionBar().setSelectedNavigationItem(index); |