commit d29f2d263af9a3017799d3098ed208a49c5ecc69
author Adam Powell <adamp@google.com> Wed Jan 09 11:19:22 2013 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 09 11:19:22 2013 -0800
tree 917f2549a0bae2ac23a8a9ce0a7fa7b819e8c7a4
parent 25505f959cc5faada8f9d2af7784f898439fc264
parent 4dca8636f8c674a7770031c71bc785ef05f22ff9

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

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) {