diff options
| -rw-r--r-- | Android.bp | 6 | ||||
| -rw-r--r-- | Android.mk | 16 | ||||
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/layout-sw800dp/table.xml | 8 | ||||
| -rw-r--r-- | res/layout/table.xml | 8 |
5 files changed, 15 insertions, 25 deletions
diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..4d3de00 --- /dev/null +++ b/Android.bp @@ -0,0 +1,6 @@ +android_app { + name: "PhotoTable", + // Only compile source java files in this apk. + srcs: ["src/**/*.java"], + 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/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" |