diff options
| author | Brian Attwell <brianattwell@google.com> | 2014-06-30 12:45:03 -0700 |
|---|---|---|
| committer | Brian Attwell <brianattwell@google.com> | 2014-07-01 23:20:30 +0000 |
| commit | b6efe90b387e8b7bb5bf88257619e043f66e7f11 (patch) | |
| tree | 129b69ec8953c690c058a5e44cd28d0ccff08cce | |
| parent | d361a4f98bbc03cb61b9ac4504eda490ff704b60 (diff) | |
| download | frameworks_base-b6efe90b387e8b7bb5bf88257619e043f66e7f11.zip frameworks_base-b6efe90b387e8b7bb5bf88257619e043f66e7f11.tar.gz frameworks_base-b6efe90b387e8b7bb5bf88257619e043f66e7f11.tar.bz2 | |
Allow ToolbarWidgetWrapper insetStart = 0
Change-Id: I8564cfe07b082e6edb3dc1569b3020f88d286d61
| -rw-r--r-- | core/java/com/android/internal/widget/ToolbarWidgetWrapper.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java index 30cd11b..8213cb7 100644 --- a/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java +++ b/core/java/com/android/internal/widget/ToolbarWidgetWrapper.java @@ -133,11 +133,12 @@ public class ToolbarWidgetWrapper implements DecorToolbar { } final int contentInsetStart = a.getDimensionPixelOffset( - R.styleable.ActionBar_contentInsetStart, 0); + R.styleable.ActionBar_contentInsetStart, -1); final int contentInsetEnd = a.getDimensionPixelOffset( - R.styleable.ActionBar_contentInsetEnd, 0); - if (contentInsetStart > 0 || contentInsetEnd > 0) { - mToolbar.setContentInsetsRelative(contentInsetStart, contentInsetEnd); + R.styleable.ActionBar_contentInsetEnd, -1); + if (contentInsetStart >= 0 || contentInsetEnd >= 0) { + mToolbar.setContentInsetsRelative(Math.max(contentInsetStart, 0), + Math.max(contentInsetEnd, 0)); } final int titleTextStyle = a.getResourceId(R.styleable.ActionBar_titleTextStyle, 0); |