commit 4074050485d6d7df3b954984af2aa3bd8706794c
author Colin Cross <ccross@android.com> Mon May 14 13:53:08 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon May 14 13:53:08 2018 -0700
tree 1a22cb763cfdfd3f179cfeef41b2433d81b884f0
parent 97fd601978b04e23cad5a5f1647925e93a196f98
parent 997d8d211531f3ab8dba6439c2d32951c3fcfbb5

Merge "Fix errors caught by aapt2"
am: 997d8d2115

Change-Id: Ic077fa564720c10dd9d55c5465d43f9f120fa229

res/layout-sw800dp/table.xml

diff --git a/res/layout-sw800dp/table.xml b/res/layout-sw800dp/table.xml
index c40ee48..f3561bc 100644
--- a/res/layout-sw800dp/table.xml
+++ b/res/layout-sw800dp/table.xml
@@ -18,7 +18,7 @@
    android:layout_width="match_parent"
    android:layout_height="match_parent" >
   <com.android.dreams.phototable.PhotoTable
-     android:background="@+drawable/table"
+     android:background="@drawable/table"
      android:id="@+id/table"
      android:layout_width="match_parent"
      android:layout_height="match_parent" >
@@ -27,7 +27,7 @@
           android:id="@+id/scrim"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
-          android:background="@+drawable/table"
+          android:background="@drawable/table"
           android:alpha="0"
           android:visibility="gone"
           />
@@ -47,12 +47,12 @@
 
      </com.android.dreams.phototable.PhotoTable>
   <!-- View
-     android:background="@+drawable/vignette_br"
+     android:background="@drawable/vignette_br"
      android:layout_gravity="bottom|right"
      android:layout_width="200dp"
      android:layout_height="200dp" />
   <View
-     android:background="@+drawable/vignette_tl"
+     android:background="@drawable/vignette_tl"
      android:layout_gravity="top|left"
      android:layout_width="200dp"
      android:layout_height="200dp" / -->

res/layout/table.xml

diff --git a/res/layout/table.xml b/res/layout/table.xml
index 10622f5..3b5a0da 100644
--- a/res/layout/table.xml
+++ b/res/layout/table.xml
@@ -23,14 +23,14 @@
       android:id="@+id/table"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:background="@+drawable/table"
+      android:background="@drawable/table"
       android:focusable="true" >
 
      <View
          android:id="@+id/scrim"
          android:layout_width="match_parent"
          android:layout_height="match_parent"
-         android:background="@+drawable/table"
+         android:background="@drawable/table"
          android:alpha="0"
          android:visibility="gone"
          />
@@ -50,13 +50,13 @@
 
      </com.android.dreams.phototable.PhotoTable>
   <!-- View
-     android:background="@+drawable/vignette_br"
+     android:background="@drawable/vignette_br"
      android:layout_gravity="bottom|right"
      android:layout_width="300dp"
      android:layout_height="300dp"
      / -->
   <!-- View
-     android:background="@+drawable/vignette_tl"
+     android:background="@drawable/vignette_tl"
      android:layout_gravity="top|left"
      android:layout_width="300dp"
      android:layout_height="300dp"