Merge pie-platform-release to aosp-master - DO NOT MERGE
Change-Id: I8e0e1b1ccfca82ed7cad47abe57661bd01e4d34a
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"
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index c191343..edc2b10 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -25,6 +25,6 @@
<string name="local_source_name" msgid="6487253091085518505">"Fotos del dispositiu"</string>
<string name="need_to_configure" msgid="1269102638159389032">"No s\'ha seleccionat cap foto."</string>
<string name="photodream_select_all" msgid="6364858563337927827">"Selec. tot"</string>
- <string name="photodream_select_none" msgid="8816452124894525861">"Anul. sel. tot"</string>
+ <string name="photodream_select_none" msgid="8816452124894525861">"Desselecciona tot"</string>
<string name="no_photos" msgid="4262083523147564199">"No hi ha cap foto al dispositiu."</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 92cd1e6..67af3fd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -20,7 +20,7 @@
<string name="table_screensaver_name" msgid="1150228032617397055">"照片桌面"</string>
<string name="flipper_screensaver_name" msgid="6988572107391523141">"相框"</string>
<string name="posts_album_name" msgid="5628151551239729515">"信息中的照片"</string>
- <string name="unknown_album_name" msgid="2135521368192091267">"未命名相册"</string>
+ <string name="unknown_album_name" msgid="2135521368192091267">"未命名影集"</string>
<string name="stock_photo_album_name" msgid="3150527596227525460">"图库照片"</string>
<string name="local_source_name" msgid="6487253091085518505">"设备中的照片"</string>
<string name="need_to_configure" msgid="1269102638159389032">"未选择任何照片。"</string>
