summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-03-04 23:42:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-04 23:42:28 +0000
commit34691cffe3c84c575de5f9342a6a70001920d418 (patch)
tree601651dbd8ccbec44e07b6aea9ee8f3598ab385d /res
parent9f8ebbe70c65cfa4ae73cae6025f9ff1bd90d6c3 (diff)
parent15f7de8332db88e1b11f2ee093d122264765ba0a (diff)
downloadandroid_packages_apps_Trebuchet-34691cffe3c84c575de5f9342a6a70001920d418.tar.gz
android_packages_apps_Trebuchet-34691cffe3c84c575de5f9342a6a70001920d418.tar.bz2
android_packages_apps_Trebuchet-34691cffe3c84c575de5f9342a6a70001920d418.zip
Merge "Drop target NPE due to wrong android:theme usage" into ub-launcher3-master
Diffstat (limited to 'res')
-rw-r--r--res/layout/snackbar.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/snackbar.xml b/res/layout/snackbar.xml
index bca330842..b81894386 100644
--- a/res/layout/snackbar.xml
+++ b/res/layout/snackbar.xml
@@ -29,7 +29,7 @@
android:ellipsize="end"
android:textSize="@dimen/snackbar_max_text_size"
android:textColor="?android:attr/textColorPrimary"
- android:theme="@style/TextTitle"/>
+ style="@style/TextTitle"/>
<TextView
android:id="@+id/action"
android:layout_height="@dimen/snackbar_content_height"
@@ -42,6 +42,6 @@
android:textStyle="bold"
android:textSize="@dimen/snackbar_max_text_size"
android:textColor="?android:attr/colorAccent"
- android:theme="@style/TextTitle"
+ style="@style/TextTitle"
android:capitalize="sentences"/>
</merge> \ No newline at end of file