Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev
diff --git a/design/base/android/support/design/widget/FloatingActionButtonImpl.java b/design/base/android/support/design/widget/FloatingActionButtonImpl.java
index 7fcb147..969e570 100644
--- a/design/base/android/support/design/widget/FloatingActionButtonImpl.java
+++ b/design/base/android/support/design/widget/FloatingActionButtonImpl.java
@@ -21,7 +21,6 @@
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.support.design.R;
-import android.support.v4.graphics.drawable.DrawableCompat;
import android.view.View;
abstract class FloatingActionButtonImpl {
@@ -67,10 +66,10 @@
final Resources resources = mView.getResources();
CircularBorderDrawable borderDrawable = newCircularDrawable();
borderDrawable.setGradientColors(
- resources.getColor(R.color.fab_stroke_top_outer_color),
- resources.getColor(R.color.fab_stroke_top_inner_color),
- resources.getColor(R.color.fab_stroke_end_inner_color),
- resources.getColor(R.color.fab_stroke_end_outer_color));
+ resources.getColor(R.color.design_fab_stroke_top_outer_color),
+ resources.getColor(R.color.design_fab_stroke_top_inner_color),
+ resources.getColor(R.color.design_fab_stroke_end_inner_color),
+ resources.getColor(R.color.design_fab_stroke_end_outer_color));
borderDrawable.setBorderWidth(borderWidth);
borderDrawable.setTintColor(backgroundTint.getDefaultColor());
return borderDrawable;
diff --git a/design/base/android/support/design/widget/ShadowDrawableWrapper.java b/design/base/android/support/design/widget/ShadowDrawableWrapper.java
index d8144d4..dec1b62 100644
--- a/design/base/android/support/design/widget/ShadowDrawableWrapper.java
+++ b/design/base/android/support/design/widget/ShadowDrawableWrapper.java
@@ -18,7 +18,6 @@
import android.content.res.Resources;
import android.graphics.Canvas;
-import android.graphics.ColorFilter;
import android.graphics.LinearGradient;
import android.graphics.Paint;
import android.graphics.Path;
@@ -81,9 +80,9 @@
float shadowSize, float maxShadowSize) {
super(content);
- mShadowStartColor = resources.getColor(R.color.shadow_start_color);
- mShadowMiddleColor = resources.getColor(R.color.shadow_mid_color);
- mShadowEndColor = resources.getColor(R.color.shadow_end_color);
+ mShadowStartColor = resources.getColor(R.color.design_fab_shadow_start_color);
+ mShadowMiddleColor = resources.getColor(R.color.design_fab_shadow_mid_color);
+ mShadowEndColor = resources.getColor(R.color.design_fab_shadow_end_color);
mCornerShadowPaint = new Paint(Paint.ANTI_ALIAS_FLAG | Paint.DITHER_FLAG);
mCornerShadowPaint.setStyle(Paint.Style.FILL);
diff --git a/design/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java b/design/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java
index 1aa0b683..3e36a14 100644
--- a/design/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java
+++ b/design/eclair-mr1/android/support/design/widget/FloatingActionButtonEclairMr1.java
@@ -164,7 +164,7 @@
}
Animation anim = android.view.animation.AnimationUtils.loadAnimation(
- mView.getContext(), R.anim.fab_out);
+ mView.getContext(), R.anim.design_fab_out);
anim.setInterpolator(AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR);
anim.setDuration(SHOW_HIDE_ANIM_DURATION);
anim.setAnimationListener(new AnimationUtils.AnimationListenerAdapter() {
@@ -185,7 +185,7 @@
@Override
void show() {
Animation anim = android.view.animation.AnimationUtils.loadAnimation(
- mView.getContext(), R.anim.fab_in);
+ mView.getContext(), R.anim.design_fab_in);
anim.setDuration(SHOW_HIDE_ANIM_DURATION);
anim.setInterpolator(AnimationUtils.FAST_OUT_SLOW_IN_INTERPOLATOR);
mView.startAnimation(anim);
diff --git a/design/res/anim/fab_in.xml b/design/res/anim/design_fab_in.xml
similarity index 100%
rename from design/res/anim/fab_in.xml
rename to design/res/anim/design_fab_in.xml
diff --git a/design/res/anim/fab_out.xml b/design/res/anim/design_fab_out.xml
similarity index 100%
rename from design/res/anim/fab_out.xml
rename to design/res/anim/design_fab_out.xml
diff --git a/design/res/anim/snackbar_in.xml b/design/res/anim/design_snackbar_in.xml
similarity index 100%
rename from design/res/anim/snackbar_in.xml
rename to design/res/anim/design_snackbar_in.xml
diff --git a/design/res/anim/snackbar_out.xml b/design/res/anim/design_snackbar_out.xml
similarity index 100%
rename from design/res/anim/snackbar_out.xml
rename to design/res/anim/design_snackbar_out.xml
diff --git a/design/res/drawable/fab_background.xml b/design/res/drawable/design_fab_background.xml
similarity index 100%
rename from design/res/drawable/fab_background.xml
rename to design/res/drawable/design_fab_background.xml
diff --git a/design/res/drawable/snackbar_background.xml b/design/res/drawable/design_snackbar_background.xml
similarity index 84%
rename from design/res/drawable/snackbar_background.xml
rename to design/res/drawable/design_snackbar_background.xml
index 739b516..e82441c 100644
--- a/design/res/drawable/snackbar_background.xml
+++ b/design/res/drawable/design_snackbar_background.xml
@@ -17,6 +17,6 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <corners android:radius="@dimen/snackbar_background_corner_radius"/>
- <solid android:color="@color/snackbar_background_color"/>
+ <corners android:radius="@dimen/design_snackbar_background_corner_radius"/>
+ <solid android:color="@color/design_snackbar_background_color"/>
</shape>
\ No newline at end of file
diff --git a/design/res/layout-sw600dp/layout_snackbar.xml b/design/res/layout-sw600dp/design_layout_snackbar.xml
similarity index 100%
rename from design/res/layout-sw600dp/layout_snackbar.xml
rename to design/res/layout-sw600dp/design_layout_snackbar.xml
diff --git a/design/res/layout/layout_snackbar.xml b/design/res/layout/design_layout_snackbar.xml
similarity index 100%
rename from design/res/layout/layout_snackbar.xml
rename to design/res/layout/design_layout_snackbar.xml
diff --git a/design/res/layout/layout_snackbar_include.xml b/design/res/layout/design_layout_snackbar_include.xml
similarity index 64%
rename from design/res/layout/layout_snackbar_include.xml
rename to design/res/layout/design_layout_snackbar_include.xml
index 0cf2002..f1fd08e 100644
--- a/design/res/layout/layout_snackbar_include.xml
+++ b/design/res/layout/design_layout_snackbar_include.xml
@@ -22,12 +22,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingTop="@dimen/snackbar_padding_vertical"
- android:paddingBottom="@dimen/snackbar_padding_vertical"
- android:paddingLeft="@dimen/snackbar_padding_horizontal"
- android:paddingRight="@dimen/snackbar_padding_horizontal"
+ android:paddingTop="@dimen/design_snackbar_padding_vertical"
+ android:paddingBottom="@dimen/design_snackbar_padding_vertical"
+ android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
+ android:paddingRight="@dimen/design_snackbar_padding_horizontal"
android:textAppearance="@style/TextAppearance.Design.Snackbar.Message"
- android:maxLines="@integer/snackbar_text_max_lines"
+ android:maxLines="@integer/design_snackbar_text_max_lines"
android:layout_gravity="center_vertical|left|start"
android:ellipsize="end"/>
@@ -35,14 +35,14 @@
android:id="@+id/snackbar_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/snackbar_extra_spacing_horizontal"
- android:layout_marginStart="@dimen/snackbar_extra_spacing_horizontal"
+ android:layout_marginLeft="@dimen/design_snackbar_extra_spacing_horizontal"
+ android:layout_marginStart="@dimen/design_snackbar_extra_spacing_horizontal"
android:layout_gravity="center_vertical|right|end"
android:background="?attr/selectableItemBackground"
- android:paddingTop="@dimen/snackbar_padding_vertical"
- android:paddingBottom="@dimen/snackbar_padding_vertical"
- android:paddingLeft="@dimen/snackbar_padding_horizontal"
- android:paddingRight="@dimen/snackbar_padding_horizontal"
+ android:paddingTop="@dimen/design_snackbar_padding_vertical"
+ android:paddingBottom="@dimen/design_snackbar_padding_vertical"
+ android:paddingLeft="@dimen/design_snackbar_padding_horizontal"
+ android:paddingRight="@dimen/design_snackbar_padding_horizontal"
android:visibility="gone"
android:textAppearance="@style/TextAppearance.Design.Snackbar.Action"/>
diff --git a/design/res/layout/layout_tab_icon.xml b/design/res/layout/design_layout_tab_icon.xml
similarity index 100%
rename from design/res/layout/layout_tab_icon.xml
rename to design/res/layout/design_layout_tab_icon.xml
diff --git a/design/res/layout/layout_tab_text.xml b/design/res/layout/design_layout_tab_text.xml
similarity index 100%
rename from design/res/layout/layout_tab_text.xml
rename to design/res/layout/design_layout_tab_text.xml
diff --git a/design/res/layout/design_navigation_item.xml b/design/res/layout/design_navigation_item.xml
index 59ee05c..3fcd74a 100644
--- a/design/res/layout/design_navigation_item.xml
+++ b/design/res/layout/design_navigation_item.xml
@@ -20,7 +20,7 @@
android:layout_height="?attr/listPreferredItemHeightSmall"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
- android:drawablePadding="@dimen/navigation_icon_padding"
+ android:drawablePadding="@dimen/design_navigation_icon_padding"
android:gravity="center_vertical|start"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
diff --git a/design/res/layout/design_navigation_item_header.xml b/design/res/layout/design_navigation_item_header.xml
index 9886007..33fd199 100644
--- a/design/res/layout/design_navigation_item_header.xml
+++ b/design/res/layout/design_navigation_item_header.xml
@@ -18,4 +18,4 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingBottom="@dimen/navigation_separator_vertical_padding" />
+ android:paddingBottom="@dimen/design_navigation_separator_vertical_padding" />
diff --git a/design/res/layout/design_navigation_menu.xml b/design/res/layout/design_navigation_menu.xml
index a40f2eb..02aab37 100644
--- a/design/res/layout/design_navigation_menu.xml
+++ b/design/res/layout/design_navigation_menu.xml
@@ -18,8 +18,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="@dimen/navigation_padding_top_default"
- android:paddingBottom="@dimen/navigation_padding_bottom"
+ android:paddingTop="@dimen/design_navigation_padding_top_default"
+ android:paddingBottom="@dimen/design_navigation_padding_bottom"
android:clipToPadding="false"
android:divider="@null"
android:listSelector="?attr/selectableItemBackground"/>
diff --git a/design/res/values-sw600dp/config.xml b/design/res/values-sw600dp/config.xml
index baac13b..58b6207 100644
--- a/design/res/values-sw600dp/config.xml
+++ b/design/res/values-sw600dp/config.xml
@@ -17,6 +17,6 @@
<resources>
- <integer name="snackbar_text_max_lines">1</integer>
+ <integer name="design_snackbar_text_max_lines">1</integer>
</resources>
\ No newline at end of file
diff --git a/design/res/values-sw600dp/dimens.xml b/design/res/values-sw600dp/dimens.xml
index 37c3ff5..ebbc20e 100644
--- a/design/res/values-sw600dp/dimens.xml
+++ b/design/res/values-sw600dp/dimens.xml
@@ -17,13 +17,13 @@
<resources>
- <dimen name="tab_min_width">160dp</dimen>
+ <dimen name="design_tab_min_width">160dp</dimen>
- <dimen name="snackbar_min_width">320dp</dimen>
- <dimen name="snackbar_max_width">576dp</dimen>
- <dimen name="snackbar_padding_vertical_2lines">@dimen/snackbar_padding_vertical</dimen>
- <dimen name="snackbar_extra_spacing_horizontal">24dp</dimen>
- <dimen name="snackbar_background_corner_radius">2dp</dimen>
- <dimen name="snackbar_action_inline_max_width">0dp</dimen>
+ <dimen name="design_snackbar_min_width">320dp</dimen>
+ <dimen name="design_snackbar_max_width">576dp</dimen>
+ <dimen name="design_snackbar_padding_vertical_2lines">@dimen/design_snackbar_padding_vertical</dimen>
+ <dimen name="design_snackbar_extra_spacing_horizontal">24dp</dimen>
+ <dimen name="design_snackbar_background_corner_radius">2dp</dimen>
+ <dimen name="design_snackbar_action_inline_max_width">0dp</dimen>
</resources>
\ No newline at end of file
diff --git a/design/res/values-v21/dimens.xml b/design/res/values-v21/dimens.xml
index 2a67937..447aeb2 100644
--- a/design/res/values-v21/dimens.xml
+++ b/design/res/values-v21/dimens.xml
@@ -15,5 +15,5 @@
~ limitations under the License.
-->
<resources>
- <dimen name="navigation_padding_top_default">24dp</dimen>
+ <dimen name="design_navigation_padding_top_default">24dp</dimen>
</resources>
diff --git a/design/res/values/colors.xml b/design/res/values/colors.xml
index 216ad79..a958156 100644
--- a/design/res/values/colors.xml
+++ b/design/res/values/colors.xml
@@ -18,23 +18,23 @@
<resources>
<!-- Color for the top outer pixels in the stroke: 18% white (these are multiplied) -->
- <color name="fab_stroke_top_outer_color">#2EFFFFFF</color>
+ <color name="design_fab_stroke_top_outer_color">#2EFFFFFF</color>
<!-- Color for the top inner pixels in the stroke: 10% white (these are multiplied) -->
- <color name="fab_stroke_top_inner_color">#1AFFFFFF</color>
+ <color name="design_fab_stroke_top_inner_color">#1AFFFFFF</color>
<!-- Color for the bottom outer pixels in the stroke: 6% black (these are multiplied) -->
- <color name="fab_stroke_end_outer_color">#0F000000</color>
+ <color name="design_fab_stroke_end_outer_color">#0F000000</color>
<!-- Color for the bottom inner pixels in the stroke: 4% black (these are multiplied) -->
- <color name="fab_stroke_end_inner_color">#0A000000</color>
+ <color name="design_fab_stroke_end_inner_color">#0A000000</color>
<!-- Shadow color for the first pixels of a shadow -->
- <color name="shadow_start_color">#44000000</color>
+ <color name="design_fab_shadow_start_color">#44000000</color>
<!-- Shadow color for the middle pixels of a shadow -->
- <color name="shadow_mid_color">#14000000</color>
+ <color name="design_fab_shadow_mid_color">#14000000</color>
<!-- Shadow color for the furthest pixels of a shadow -->
- <color name="shadow_end_color">@android:color/transparent</color>
+ <color name="design_fab_shadow_end_color">@android:color/transparent</color>
- <color name="error_color">#FFDD2C00</color>
+ <color name="design_textinput_error_color">#FFDD2C00</color>
- <color name="snackbar_background_color">#323232</color>
+ <color name="design_snackbar_background_color">#323232</color>
</resources>
\ No newline at end of file
diff --git a/design/res/values/config.xml b/design/res/values/config.xml
index 2ff276a..67635a8 100644
--- a/design/res/values/config.xml
+++ b/design/res/values/config.xml
@@ -17,6 +17,6 @@
<resources>
- <integer name="snackbar_text_max_lines">2</integer>
+ <integer name="design_snackbar_text_max_lines">2</integer>
</resources>
\ No newline at end of file
diff --git a/design/res/values/dimens.xml b/design/res/values/dimens.xml
index 45e83e6..034809d 100644
--- a/design/res/values/dimens.xml
+++ b/design/res/values/dimens.xml
@@ -16,41 +16,41 @@
-->
<resources>
- <dimen name="fab_elevation">8dp</dimen>
- <dimen name="fab_translation_z_pressed">6dp</dimen>
- <dimen name="fab_content_size">24dp</dimen>
- <dimen name="fab_size_normal">56dp</dimen>
- <dimen name="fab_size_mini">40dp</dimen>
- <dimen name="fab_border_width">0.5dp</dimen>
+ <dimen name="design_fab_elevation">8dp</dimen>
+ <dimen name="design_fab_translation_z_pressed">6dp</dimen>
+ <dimen name="design_fab_content_size">24dp</dimen>
+ <dimen name="design_fab_size_normal">56dp</dimen>
+ <dimen name="design_fab_size_mini">40dp</dimen>
+ <dimen name="design_fab_border_width">0.5dp</dimen>
- <dimen name="navigation_max_width">320dp</dimen>
- <dimen name="navigation_elevation">12dp</dimen>
- <dimen name="navigation_icon_padding">32dp</dimen>
- <dimen name="navigation_icon_size">24dp</dimen>
- <dimen name="navigation_separator_vertical_padding">8dp</dimen>
- <dimen name="navigation_padding_top_default">0dp</dimen>
- <dimen name="navigation_padding_bottom">8dp</dimen>
+ <dimen name="design_navigation_max_width">320dp</dimen>
+ <dimen name="design_navigation_elevation">12dp</dimen>
+ <dimen name="design_navigation_icon_padding">32dp</dimen>
+ <dimen name="design_navigation_icon_size">24dp</dimen>
+ <dimen name="design_navigation_separator_vertical_padding">8dp</dimen>
+ <dimen name="design_navigation_padding_top_default">0dp</dimen>
+ <dimen name="design_navigation_padding_bottom">8dp</dimen>
- <dimen name="tab_min_width">72dp</dimen>
- <dimen name="tab_max_width">264dp</dimen>
+ <dimen name="design_tab_min_width">72dp</dimen>
+ <dimen name="design_tab_max_width">264dp</dimen>
- <dimen name="snackbar_min_width">-1px</dimen>
- <dimen name="snackbar_max_width">-1px</dimen>
- <dimen name="snackbar_elevation">2dp</dimen>
- <dimen name="snackbar_background_corner_radius">0dp</dimen>
+ <dimen name="design_snackbar_min_width">-1px</dimen>
+ <dimen name="design_snackbar_max_width">-1px</dimen>
+ <dimen name="design_snackbar_elevation">2dp</dimen>
+ <dimen name="design_snackbar_background_corner_radius">0dp</dimen>
- <dimen name="snackbar_padding_horizontal">12dp</dimen>
- <dimen name="snackbar_padding_vertical">14dp</dimen>
- <dimen name="snackbar_padding_vertical_2lines">24dp</dimen>
+ <dimen name="design_snackbar_padding_horizontal">12dp</dimen>
+ <dimen name="design_snackbar_padding_vertical">14dp</dimen>
+ <dimen name="design_snackbar_padding_vertical_2lines">24dp</dimen>
<!-- Extra spacing between the action and message views -->
- <dimen name="snackbar_extra_spacing_horizontal">0dp</dimen>
+ <dimen name="design_snackbar_extra_spacing_horizontal">0dp</dimen>
<!-- The maximum width for a Snackbar's inline action. If the view is width than this then
the Snackbar will change to vertical stacking -->
- <dimen name="snackbar_action_inline_max_width">128dp</dimen>
+ <dimen name="design_snackbar_action_inline_max_width">128dp</dimen>
- <dimen name="snackbar_text_size">14sp</dimen>
+ <dimen name="design_snackbar_text_size">14sp</dimen>
- <dimen name="appbar_elevation">4dp</dimen>
+ <dimen name="design_appbar_elevation">4dp</dimen>
</resources>
diff --git a/design/res/values/styles.xml b/design/res/values/styles.xml
index 067846c..8736183 100644
--- a/design/res/values/styles.xml
+++ b/design/res/values/styles.xml
@@ -17,13 +17,13 @@
<resources>
<style name="Widget.Design.FloatingActionButton" parent="android:Widget">
- <item name="android:background">@drawable/fab_background</item>
+ <item name="android:background">@drawable/design_fab_background</item>
<item name="backgroundTint">?attr/colorAccent</item>
<item name="fabSize">normal</item>
- <item name="elevation">@dimen/fab_elevation</item>
- <item name="pressedTranslationZ">@dimen/fab_translation_z_pressed</item>
+ <item name="elevation">@dimen/design_fab_elevation</item>
+ <item name="pressedTranslationZ">@dimen/design_fab_translation_z_pressed</item>
<item name="rippleColor">?attr/colorControlHighlight</item>
- <item name="borderWidth">@dimen/fab_border_width</item>
+ <item name="borderWidth">@dimen/design_fab_border_width</item>
</style>
<style name="Widget.Design.ScrimInsetsFrameLayout" parent="">
@@ -31,10 +31,10 @@
</style>
<style name="Widget.Design.NavigationView" parent="">
- <item name="elevation">@dimen/navigation_elevation</item>
+ <item name="elevation">@dimen/design_navigation_elevation</item>
<item name="android:background">?android:attr/windowBackground</item>
<item name="android:fitsSystemWindows">true</item>
- <item name="android:maxWidth">@dimen/navigation_max_width</item>
+ <item name="android:maxWidth">@dimen/design_navigation_max_width</item>
</style>
<style name="Widget.Design.TabLayout" parent="Base.Widget.Design.TabLayout">
@@ -43,7 +43,7 @@
</style>
<style name="Base.Widget.Design.TabLayout" parent="android:Widget">
- <item name="tabMaxWidth">@dimen/tab_max_width</item>
+ <item name="tabMaxWidth">@dimen/design_tab_max_width</item>
<item name="tabIndicatorColor">?attr/colorAccent</item>
<item name="tabIndicatorHeight">2dp</item>
<item name="tabPaddingStart">12dp</item>
@@ -69,11 +69,11 @@
</style>
<style name="TextAppearance.Design.Error" parent="TextAppearance.AppCompat.Caption">
- <item name="android:textColor">@color/error_color</item>
+ <item name="android:textColor">@color/design_textinput_error_color</item>
</style>
<style name="TextAppearance.Design.Snackbar.Message" parent="android:TextAppearance">
- <item name="android:textSize">@dimen/snackbar_text_size</item>
+ <item name="android:textSize">@dimen/design_snackbar_text_size</item>
<item name="android:textColor">?android:textColorPrimary</item>
</style>
@@ -83,13 +83,13 @@
<style name="Widget.Design.Snackbar" parent="android:Widget">
<item name="android:theme">@style/ThemeOverlay.AppCompat.Dark</item>
- <item name="android:minWidth">@dimen/snackbar_min_width</item>
- <item name="android:maxWidth">@dimen/snackbar_max_width</item>
- <item name="android:background">@drawable/snackbar_background</item>
- <item name="android:paddingLeft">@dimen/snackbar_padding_horizontal</item>
- <item name="android:paddingRight">@dimen/snackbar_padding_horizontal</item>
- <item name="elevation">@dimen/snackbar_elevation</item>
- <item name="maxActionInlineWidth">@dimen/snackbar_action_inline_max_width</item>
+ <item name="android:minWidth">@dimen/design_snackbar_min_width</item>
+ <item name="android:maxWidth">@dimen/design_snackbar_max_width</item>
+ <item name="android:background">@drawable/design_snackbar_background</item>
+ <item name="android:paddingLeft">@dimen/design_snackbar_padding_horizontal</item>
+ <item name="android:paddingRight">@dimen/design_snackbar_padding_horizontal</item>
+ <item name="elevation">@dimen/design_snackbar_elevation</item>
+ <item name="maxActionInlineWidth">@dimen/design_snackbar_action_inline_max_width</item>
</style>
<style name="Widget.Design.CollapsingToolbar" parent="android:Widget">
@@ -100,7 +100,7 @@
</style>
<style name="Widget.Design.AppBarLayout" parent="android:Widget">
- <item name="elevation">@dimen/appbar_elevation</item>
+ <item name="elevation">@dimen/design_appbar_elevation</item>
<item name="android:background">?attr/colorPrimary</item>
</style>
diff --git a/design/src/android/support/design/internal/NavigationMenuItemView.java b/design/src/android/support/design/internal/NavigationMenuItemView.java
index 4a97a8a..7813163 100644
--- a/design/src/android/support/design/internal/NavigationMenuItemView.java
+++ b/design/src/android/support/design/internal/NavigationMenuItemView.java
@@ -52,7 +52,8 @@
public NavigationMenuItemView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
- mIconSize = context.getResources().getDimensionPixelSize(R.dimen.navigation_icon_size);
+ mIconSize = context.getResources().getDimensionPixelSize(
+ R.dimen.design_navigation_icon_size);
}
@Override
diff --git a/design/src/android/support/design/internal/NavigationMenuPresenter.java b/design/src/android/support/design/internal/NavigationMenuPresenter.java
index e80e677..34a82ee 100644
--- a/design/src/android/support/design/internal/NavigationMenuPresenter.java
+++ b/design/src/android/support/design/internal/NavigationMenuPresenter.java
@@ -86,9 +86,10 @@
mLayoutInflater = LayoutInflater.from(context);
mMenu = menu;
Resources res = context.getResources();
- mPaddingTopDefault = res.getDimensionPixelOffset(R.dimen.navigation_padding_top_default);
+ mPaddingTopDefault = res.getDimensionPixelOffset(
+ R.dimen.design_navigation_padding_top_default);
mPaddingSeparator = res.getDimensionPixelOffset(
- R.dimen.navigation_separator_vertical_padding);
+ R.dimen.design_navigation_separator_vertical_padding);
}
@Override
diff --git a/design/src/android/support/design/widget/FloatingActionButton.java b/design/src/android/support/design/widget/FloatingActionButton.java
index b275174..2efee17 100644
--- a/design/src/android/support/design/widget/FloatingActionButton.java
+++ b/design/src/android/support/design/widget/FloatingActionButton.java
@@ -126,7 +126,8 @@
mImpl = new FloatingActionButtonEclairMr1(this, delegate);
}
- final int maxContentSize = (int) getResources().getDimension(R.dimen.fab_content_size);
+ final int maxContentSize = (int) getResources().getDimension(
+ R.dimen.design_fab_content_size);
mContentPadding = (getSizeDimension() - maxContentSize) / 2;
mImpl.setBackgroundDrawable(background, mBackgroundTint,
@@ -257,10 +258,10 @@
final int getSizeDimension() {
switch (mSize) {
case SIZE_MINI:
- return getResources().getDimensionPixelSize(R.dimen.fab_size_mini);
+ return getResources().getDimensionPixelSize(R.dimen.design_fab_size_mini);
case SIZE_NORMAL:
default:
- return getResources().getDimensionPixelSize(R.dimen.fab_size_normal);
+ return getResources().getDimensionPixelSize(R.dimen.design_fab_size_normal);
}
}
diff --git a/design/src/android/support/design/widget/Snackbar.java b/design/src/android/support/design/widget/Snackbar.java
index 83888ce..aa1a291 100644
--- a/design/src/android/support/design/widget/Snackbar.java
+++ b/design/src/android/support/design/widget/Snackbar.java
@@ -156,7 +156,7 @@
mContext = parent.getContext();
LayoutInflater inflater = LayoutInflater.from(mContext);
- mView = (SnackbarLayout) inflater.inflate(R.layout.layout_snackbar, mParent, false);
+ mView = (SnackbarLayout) inflater.inflate(R.layout.design_layout_snackbar, mParent, false);
}
/**
@@ -448,7 +448,7 @@
}
}).start();
} else {
- Animation anim = AnimationUtils.loadAnimation(mView.getContext(), R.anim.snackbar_in);
+ Animation anim = AnimationUtils.loadAnimation(mView.getContext(), R.anim.design_snackbar_in);
anim.setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR);
anim.setDuration(ANIMATION_DURATION);
anim.setAnimationListener(new Animation.AnimationListener() {
@@ -487,7 +487,7 @@
}
}).start();
} else {
- Animation anim = AnimationUtils.loadAnimation(mView.getContext(), R.anim.snackbar_out);
+ Animation anim = AnimationUtils.loadAnimation(mView.getContext(), R.anim.design_snackbar_out);
anim.setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR);
anim.setDuration(ANIMATION_DURATION);
anim.setAnimationListener(new Animation.AnimationListener() {
@@ -580,7 +580,7 @@
// Now inflate our content. We need to do this manually rather than using an <include>
// in the layout since older versions of the Android do not inflate includes with
// the correct Context.
- LayoutInflater.from(context).inflate(R.layout.layout_snackbar_include, this);
+ LayoutInflater.from(context).inflate(R.layout.design_layout_snackbar_include, this);
}
@Override
@@ -608,9 +608,9 @@
}
final int multiLineVPadding = getResources().getDimensionPixelSize(
- R.dimen.snackbar_padding_vertical_2lines);
+ R.dimen.design_snackbar_padding_vertical_2lines);
final int singleLineVPadding = getResources().getDimensionPixelSize(
- R.dimen.snackbar_padding_vertical);
+ R.dimen.design_snackbar_padding_vertical);
final boolean isMultiLine = mMessageView.getLayout().getLineCount() > 1;
boolean remeasure = false;
diff --git a/design/src/android/support/design/widget/TabLayout.java b/design/src/android/support/design/widget/TabLayout.java
index ae052fd..b2d468c 100755
--- a/design/src/android/support/design/widget/TabLayout.java
+++ b/design/src/android/support/design/widget/TabLayout.java
@@ -1225,13 +1225,13 @@
// If there isn't a custom view, we'll us our own in-built layouts
if (mIconView == null) {
ImageView iconView = (ImageView) LayoutInflater.from(getContext())
- .inflate(R.layout.layout_tab_icon, this, false);
+ .inflate(R.layout.design_layout_tab_icon, this, false);
addView(iconView, 0);
mIconView = iconView;
}
if (mTextView == null) {
TextView textView = (TextView) LayoutInflater.from(getContext())
- .inflate(R.layout.layout_tab_text, this, false);
+ .inflate(R.layout.design_layout_tab_text, this, false);
addView(textView);
mTextView = textView;
}