am 79cc4a2a: 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 '79cc4a2ab0130acca83de5945a43adf9925beac1':
  Make action bar title a valid touch target for up when relevant
This commit is contained in:
Adam Powell
2013-01-10 15:39:00 -08:00
committed by Android Git Automerger

View File

@@ -1052,6 +1052,7 @@ public class ActionBarView extends AbsActionBarView {
(mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0; (mDisplayOptions & ActionBar.DISPLAY_SHOW_TITLE) != 0;
if (showTitle) { if (showTitle) {
x += positionChild(mTitleLayout, x, y, contentHeight, isLayoutRtl); x += positionChild(mTitleLayout, x, y, contentHeight, isLayoutRtl);
homeSlop = mTitleLayout.getWidth();
} }
switch (mNavigationMode) { switch (mNavigationMode) {