diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-13 09:35:02 -0700 |
|---|---|---|
| committer | Richard MacGregor <rmacgregor@cyngn.com> | 2016-04-13 17:20:59 -0700 |
| commit | 70656f2a77b29a7a71393ec8c152bbfdb6cc1af7 (patch) | |
| tree | 1d99f6848629c90dfef7fc1b52e98352565c0619 | |
| parent | 02164017d808640e32a2dfa668f70526854b5834 (diff) | |
| download | android_external_cyanogen_UICommon-70656f2a77b29a7a71393ec8c152bbfdb6cc1af7.tar.gz android_external_cyanogen_UICommon-70656f2a77b29a7a71393ec8c152bbfdb6cc1af7.tar.bz2 android_external_cyanogen_UICommon-70656f2a77b29a7a71393ec8c152bbfdb6cc1af7.zip | |
Make UICommon Snackbar attribute not conflict with appcompat
If a project were to include appcompat for certain functionality,
including more than just a snackbar, but doesn't want to change
all classes to use appcompat resources. This will solve the conficts.
Ticket CD-535
Change-Id: I74d641943f32e25900ffcaeaa404f767a47d953d
| -rw-r--r-- | res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 | ||||
| -rw-r--r-- | src/com/cyngn/uicommon/view/Snackbar.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index aaf224a..37d978e 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -39,6 +39,6 @@ <declare-styleable name="SnackbarLayout"> <attr name="android:maxWidth" /> <attr name="android:elevation" /> - <attr name="maxActionInlineWidth" format="dimension"/> + <attr name="uicommon_maxActionInlineWidth" format="dimension"/> </declare-styleable> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index aee04d1..bc23647 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -29,7 +29,7 @@ <item name="android:paddingLeft">@dimen/snackbar_padding_horizontal</item> <item name="android:paddingRight">@dimen/snackbar_padding_horizontal</item> <item name="android:elevation">@dimen/snackbar_elevation</item> - <item name="maxActionInlineWidth">@dimen/snackbar_action_inline_max_width</item> + <item name="uicommon_maxActionInlineWidth">@dimen/snackbar_action_inline_max_width</item> </style> </resources> diff --git a/src/com/cyngn/uicommon/view/Snackbar.java b/src/com/cyngn/uicommon/view/Snackbar.java index f645577..57579ac 100644 --- a/src/com/cyngn/uicommon/view/Snackbar.java +++ b/src/com/cyngn/uicommon/view/Snackbar.java @@ -533,7 +533,7 @@ public final class Snackbar { TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SnackbarLayout); mMaxWidth = a.getDimensionPixelSize(R.styleable.SnackbarLayout_android_maxWidth, -1); mMaxInlineActionWidth = a.getDimensionPixelSize( - R.styleable.SnackbarLayout_maxActionInlineWidth, -1); + R.styleable.SnackbarLayout_uicommon_maxActionInlineWidth, -1); if (a.hasValue(R.styleable.SnackbarLayout_android_elevation)) { setElevation(a.getDimensionPixelSize( R.styleable.SnackbarLayout_android_elevation, 0)); |