commit d17792073fd3ab963bd5e0a7edcb312720fcea26
author Adam Powell <adamp@google.com> Wed Jan 09 11:26:07 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 09 11:26:07 2013 -0800
tree 5a3d7a7d3b582412610895bd8b5690b2463e0a90
parent 782b0f7141972e0535f1e905d650073f4e7f55dd
parent 0bf63a9a76ba513b5f6c603857bcd4d3e4506566

am 0bf63a9a: am d29f2d26: Merge "Make action bar title a valid touch target for up when relevant" into jb-mr1.1-dev

* commit '0bf63a9a76ba513b5f6c603857bcd4d3e4506566':
  Make action bar title a valid touch target for up when relevant

core/java/com/android/internal/widget/ActionBarView.java

diff --git a/core/java/com/android/internal/widget/ActionBarView.java b/core/java/com/android/internal/widget/ActionBarView.java
index 6fb459c..27ecd9a 100644
--- a/core/java/com/android/internal/widget/ActionBarView.java
+++ b/core/java/com/android/internal/widget/ActionBarView.java
@@ -1051,6 +1051,7 @@
                     (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0;
             if (showTitle) {
                 x += positionChild(mTitleLayout, x, y, contentHeight, isLayoutRtl);
+                homeSlop = mTitleLayout.getWidth();
             }
 
             switch (mNavigationMode) {