diff options
| author | Adam Powell <adamp@google.com> | 2014-05-02 20:04:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-02 20:04:01 +0000 |
| commit | 9529d8f26fc635ed8742ed212a967f069c8e47c7 (patch) | |
| tree | ae5c66cf56af042418f85b8a25fcd9435992160a /core | |
| parent | 774d4a6c78e7edd9a501c73ee38108d155765c75 (diff) | |
| parent | c4b416f18d83100a386ab81e934e572cd471c4b3 (diff) | |
| download | frameworks_base-9529d8f26fc635ed8742ed212a967f069c8e47c7.zip frameworks_base-9529d8f26fc635ed8742ed212a967f069c8e47c7.tar.gz frameworks_base-9529d8f26fc635ed8742ed212a967f069c8e47c7.tar.bz2 | |
Merge "Fix a bug in querying showing state for action bars"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/ActionBarOverlayLayout.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java index 01bee0c..19d58bf 100644 --- a/core/java/com/android/internal/widget/ActionBarOverlayLayout.java +++ b/core/java/com/android/internal/widget/ActionBarOverlayLayout.java @@ -576,7 +576,7 @@ public class ActionBarOverlayLayout extends ViewGroup { } public int getActionBarHideOffset() { - return -((int) mActionBarTop.getTranslationY()); + return mActionBarTop != null ? -((int) mActionBarTop.getTranslationY()) : 0; } public void setActionBarHideOffset(int offset) { |