summaryrefslogtreecommitdiffstats
path: root/support-design/res
diff options
context:
space:
mode:
Diffstat (limited to 'support-design/res')
-rw-r--r--support-design/res/layout-sw600dp/layout_snackbar.xml2
-rw-r--r--support-design/res/layout/design_navigation_item.xml2
-rw-r--r--support-design/res/layout/design_navigation_item_subheader.xml2
-rw-r--r--support-design/res/layout/layout_tab_icon.xml21
-rw-r--r--support-design/res/layout/layout_tab_text.xml23
5 files changed, 47 insertions, 3 deletions
diff --git a/support-design/res/layout-sw600dp/layout_snackbar.xml b/support-design/res/layout-sw600dp/layout_snackbar.xml
index 6605408..b68395a 100644
--- a/support-design/res/layout-sw600dp/layout_snackbar.xml
+++ b/support-design/res/layout-sw600dp/layout_snackbar.xml
@@ -19,5 +19,5 @@
class="android.support.design.widget.Snackbar$SnackbarLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="bottom|center_vertical"
+ android:layout_gravity="bottom|center_horizontal"
style="@style/Widget.Design.Snackbar" /> \ No newline at end of file
diff --git a/support-design/res/layout/design_navigation_item.xml b/support-design/res/layout/design_navigation_item.xml
index 6f86719..59ee05c 100644
--- a/support-design/res/layout/design_navigation_item.xml
+++ b/support-design/res/layout/design_navigation_item.xml
@@ -23,4 +23,4 @@
android:drawablePadding="@dimen/navigation_icon_padding"
android:gravity="center_vertical|start"
android:maxLines="1"
- android:textAppearance="?attr/textAppearanceListItem"/>
+ android:textAppearance="@style/TextAppearance.AppCompat.Body2"/>
diff --git a/support-design/res/layout/design_navigation_item_subheader.xml b/support-design/res/layout/design_navigation_item_subheader.xml
index 9a1a810..707ec6a 100644
--- a/support-design/res/layout/design_navigation_item_subheader.xml
+++ b/support-design/res/layout/design_navigation_item_subheader.xml
@@ -21,5 +21,5 @@
android:maxLines="1"
android:paddingLeft="?attr/listPreferredItemPaddingLeft"
android:paddingRight="?attr/listPreferredItemPaddingRight"
- android:textAppearance="?attr/textAppearanceListItem"
+ android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textColor="?android:textColorSecondary"/>
diff --git a/support-design/res/layout/layout_tab_icon.xml b/support-design/res/layout/layout_tab_icon.xml
new file mode 100644
index 0000000..6464d1f
--- /dev/null
+++ b/support-design/res/layout/layout_tab_icon.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2015 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"/> \ No newline at end of file
diff --git a/support-design/res/layout/layout_tab_text.xml b/support-design/res/layout/layout_tab_text.xml
new file mode 100644
index 0000000..a83bb3d
--- /dev/null
+++ b/support-design/res/layout/layout_tab_text.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2015 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:ellipsize="end"
+ android:gravity="center"
+ android:maxLines="2"/> \ No newline at end of file