[automerger skipped] Import translations. DO NOT MERGE
am: b2b50ed09a -s ours
am skip reason: subject contains skip directive
Change-Id: Ic42a6601ecd51f85f8084ba918f8af1c44bc125a
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..0097373
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,7 @@
+android_app {
+ name: "PhotoTable",
+ // Only compile source java files in this apk.
+ srcs: ["src/**/*.java"],
+ product_specific: true,
+ sdk_version: "current",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e2f2f3a..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-# Only compile source java files in this apk.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := PhotoTable
-
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7a2b9b5..d820c87 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="com.google.android.gallery3d.permission.PICASA_STORE" />
- <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="17"/>
+ <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="28"/>
<application
android:label="@string/app_name"
diff --git a/CleanSpec.mk b/CleanSpec.mk
new file mode 100644
index 0000000..06a4188
--- /dev/null
+++ b/CleanSpec.mk
@@ -0,0 +1,51 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list. These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+# $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+# $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list. E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/PhotoTable)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
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"
