summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/java/com/android/internal/widget/ToolbarWidgetWrapper.java9
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);