diff options
| author | Jin Cao <jinyan@google.com> | 2014-08-25 21:05:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-25 21:05:50 +0000 |
| commit | 8619cd7d2ffaa648cf7590419d3cd26e5bb1024b (patch) | |
| tree | 8343daa4c62eaab7a5478a1744baa00fce53b66c /src/com/android/mail/ui/MailActivity.java | |
| parent | a6c74d6322039ba4ef57a8aae237542fb2c635a6 (diff) | |
| parent | 090ea0188eec1cd29d84d5890cbba6aebfa6b6ce (diff) | |
| download | android_packages_apps_UnifiedEmail-8619cd7d2ffaa648cf7590419d3cd26e5bb1024b.tar.gz android_packages_apps_UnifiedEmail-8619cd7d2ffaa648cf7590419d3cd26e5bb1024b.tar.bz2 android_packages_apps_UnifiedEmail-8619cd7d2ffaa648cf7590419d3cd26e5bb1024b.zip | |
Merge "Add custom view for toolbar to reposition search icon" into ub-gmail-ur14-dev
Diffstat (limited to 'src/com/android/mail/ui/MailActivity.java')
| -rw-r--r-- | src/com/android/mail/ui/MailActivity.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java index 4df24b6a1..e92ba9ab7 100644 --- a/src/com/android/mail/ui/MailActivity.java +++ b/src/com/android/mail/ui/MailActivity.java @@ -29,7 +29,6 @@ import android.nfc.NfcAdapter; import android.nfc.NfcEvent; import android.os.Bundle; import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; import android.view.DragEvent; import android.view.KeyEvent; import android.view.Menu; @@ -172,13 +171,11 @@ public class MailActivity extends AbstractMailActivity implements ControllableAc setContentView(mController.getContentViewResource()); - final Toolbar toolbar = (Toolbar) findViewById(R.id.mail_toolbar); - // Toolbar is currently only used on phone layout, so this is expected to be null - // on tablets - if (toolbar != null) { - setSupportActionBar(toolbar); - toolbar.setNavigationOnClickListener(mController.getNavigationViewClickListener()); - } + final CustomViewToolbar toolbar = (CustomViewToolbar) findViewById(R.id.mail_toolbar); + toolbar.setController(this, mController, mViewMode); + mController.setConversationListLayoutListener(toolbar); + setSupportActionBar(toolbar); + toolbar.setNavigationOnClickListener(mController.getNavigationViewClickListener()); final ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { |