diff options
| author | Colin Cross <ccross@android.com> | 2018-05-14 14:03:12 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-14 14:03:12 -0700 |
| commit | d29b20ebd69025ef7da89a22d50e8de43e2f9426 (patch) | |
| tree | baa01b0d656989513167fd76afeaada986fbf041 /res | |
| parent | 2af9ec0a7a2f4aeab3ee2d141888cb0cea433406 (diff) | |
| parent | 4074050485d6d7df3b954984af2aa3bd8706794c (diff) | |
| download | PhotoTable-d29b20ebd69025ef7da89a22d50e8de43e2f9426.tar.gz | |
Merge "Fix errors caught by aapt2" am: 997d8d2115
am: 4074050485
Change-Id: I5dc1f6da0cb57a2e57a5b4f5dd33e0d1ee25e33d
Diffstat (limited to 'res')
| -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" |