commit 79cc4a2ab0130acca83de5945a43adf9925beac1
author Adam Powell <adamp@google.com> Wed Jan 09 11:28:27 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 09 11:28:27 2013 -0800
tree 8882e1a51b5ec6da226ca4e23eaf6c38da43595f
parent b484f8e1a4f07e35a194ee43676da8eb4e9d50ef
parent d17792073fd3ab963bd5e0a7edcb312720fcea26

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

* commit 'd17792073fd3ab963bd5e0a7edcb312720fcea26':
  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) {