Fix bug 5030341 - ActionBar.getHeight is inaccurate in 2-row mode

Measure the shared container instead.

Change-Id: Ib851f773a36add19c227b3ad64a8497f1b5ff9dd

diff --git a/core/java/com/android/internal/app/ActionBarImpl.java b/core/java/com/android/internal/app/ActionBarImpl.java
index 243c605..cf5666c 100644 (file)
--- a/core/java/com/android/internal/app/ActionBarImpl.java
+++ b/core/java/com/android/internal/app/ActionBarImpl.java
@@ -500,7 +500,7 @@ public class ActionBarImpl extends ActionBar {
 
     @Override
     public int getHeight() {
-        return mActionView.getHeight();
+        return mContainerView.getHeight();
     }
 
     @Override