diff options
| author | Adam Powell <adamp@google.com> | 2014-06-12 19:57:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-12 19:57:42 +0000 |
| commit | c78f2f7feae7ec4e0439759332af4f195ba87115 (patch) | |
| tree | 813ea653f0f2cb3c5591dd0c62a9481c0fffba3c /core/java/com | |
| parent | 5b368b3d9f1f99a9b92971a0596ccb15f77017d2 (diff) | |
| parent | 263a2d658b538a52ca36c571ac6314124449f565 (diff) | |
| download | frameworks_base-c78f2f7feae7ec4e0439759332af4f195ba87115.zip frameworks_base-c78f2f7feae7ec4e0439759332af4f195ba87115.tar.gz frameworks_base-c78f2f7feae7ec4e0439759332af4f195ba87115.tar.bz2 | |
am 22e41e9a: Merge "Enable collapsing empty Toolbar-based ActionBars above tabs" into lmp-preview-dev
* commit '22e41e9add1aeb0c8a79741f587c270752a50d16':
Enable collapsing empty Toolbar-based ActionBars above tabs
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/widget/ToolbarWidgetWrapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java index b298d85..87c57f7 100644 --- a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java +++ b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java @@ -424,7 +424,7 @@ public class ToolbarWidgetWrapper implements DecorToolbar { @Override public void setCollapsible(boolean collapsible) { - // Ignore + mToolbar.setCollapsible(collapsible); } @Override |