diff options
author | Colin Cross <ccross@android.com> | 2018-05-14 20:44:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-14 20:44:44 +0000 |
commit | 997d8d211531f3ab8dba6439c2d32951c3fcfbb5 (patch) | |
tree | 1a22cb763cfdfd3f179cfeef41b2433d81b884f0 | |
parent | 97fd601978b04e23cad5a5f1647925e93a196f98 (diff) | |
parent | d917b9bc0a68ca46b558943466ddb21b08f77966 (diff) | |
download | PhotoTable-997d8d211531f3ab8dba6439c2d32951c3fcfbb5.tar.gz |
Merge "Fix errors caught by aapt2"android-p-preview-5android-p-preview-4android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-n-iot-release-smart-display-r2android-n-iot-release-smart-displayandroid-n-iot-release-polk-at1
-rw-r--r-- | res/layout-sw800dp/table.xml | 8 | ||||
-rw-r--r-- | res/layout/table.xml | 8 |
2 files changed, 8 insertions, 8 deletions
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" / --> 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" |