From 30d164851ac3d4e7397e010baa24a8e5cb0dc090 Mon Sep 17 00:00:00 2001 From: Joe Robinson Date: Tue, 15 Dec 2015 20:43:45 +0000 Subject: Migrate to IntelliJ format, also contains some minor logging changes and moved libraries --- .../res/merged/debug/drawable-hdpi-v4/icon.png | Bin 0 -> 8118 bytes .../res/merged/debug/drawable-hdpi-v4/marcus72.png | Bin 0 -> 8118 bytes .../res/merged/debug/drawable-ldpi-v4/binary.png | Bin 0 -> 197 bytes .../merged/debug/drawable-ldpi-v4/compressed.png | Bin 0 -> 214 bytes .../res/merged/debug/drawable-ldpi-v4/folder.png | Bin 0 -> 173 bytes .../res/merged/debug/drawable-ldpi-v4/generic.png | Bin 0 -> 163 bytes .../res/merged/debug/drawable-ldpi-v4/icon.png | Bin 0 -> 2523 bytes .../res/merged/debug/drawable-ldpi-v4/image.png | Bin 0 -> 245 bytes .../res/merged/debug/drawable-ldpi-v4/link.png | Bin 0 -> 198 bytes .../res/merged/debug/drawable-ldpi-v4/movie.png | Bin 0 -> 172 bytes .../res/merged/debug/drawable-ldpi-v4/music.png | Bin 0 -> 201 bytes .../res/merged/debug/drawable-ldpi-v4/text.png | Bin 0 -> 179 bytes .../res/merged/debug/drawable-ldpi-v4/unknown.png | Bin 0 -> 195 bytes .../res/merged/debug/drawable-mdpi-v4/icon.png | Bin 0 -> 4083 bytes .../res/merged/debug/drawable-mdpi-v4/up_arrow.png | Bin 0 -> 937 bytes .../res/merged/debug/layout/browser.xml | 37 ++++++++++ .../res/merged/debug/layout/filerow.xml | 47 ++++++++++++ .../intermediates/res/merged/debug/layout/home.xml | 29 ++++++++ .../res/merged/debug/layout/share.xml | 82 +++++++++++++++++++++ .../res/merged/debug/layout/soundrecorder.xml | 19 +++++ .../res/merged/debug/layout/upload.xml | 19 +++++ .../res/merged/debug/layout/uploadlocation.xml | 36 +++++++++ .../intermediates/res/merged/debug/menu/menu.xml | 16 ++++ .../res/merged/debug/values-v11/values-v11.xml | 9 +++ .../res/merged/debug/values-v14/values-v14.xml | 9 +++ .../res/merged/debug/values/values.xml | 12 +++ 26 files changed, 315 insertions(+) create mode 100644 app/build/intermediates/res/merged/debug/drawable-hdpi-v4/icon.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-hdpi-v4/marcus72.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/binary.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/compressed.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/folder.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/generic.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/icon.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/image.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/link.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/movie.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/music.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/text.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-ldpi-v4/unknown.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-mdpi-v4/icon.png create mode 100644 app/build/intermediates/res/merged/debug/drawable-mdpi-v4/up_arrow.png create mode 100644 app/build/intermediates/res/merged/debug/layout/browser.xml create mode 100644 app/build/intermediates/res/merged/debug/layout/filerow.xml create mode 100644 app/build/intermediates/res/merged/debug/layout/home.xml create mode 100644 app/build/intermediates/res/merged/debug/layout/share.xml create mode 100644 app/build/intermediates/res/merged/debug/layout/soundrecorder.xml create mode 100644 app/build/intermediates/res/merged/debug/layout/upload.xml create mode 100644 app/build/intermediates/res/merged/debug/layout/uploadlocation.xml create mode 100644 app/build/intermediates/res/merged/debug/menu/menu.xml create mode 100644 app/build/intermediates/res/merged/debug/values-v11/values-v11.xml create mode 100644 app/build/intermediates/res/merged/debug/values-v14/values-v14.xml create mode 100644 app/build/intermediates/res/merged/debug/values/values.xml (limited to 'app/build/intermediates/res/merged') diff --git a/app/build/intermediates/res/merged/debug/drawable-hdpi-v4/icon.png b/app/build/intermediates/res/merged/debug/drawable-hdpi-v4/icon.png new file mode 100644 index 0000000..4bf1db2 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-hdpi-v4/icon.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-hdpi-v4/marcus72.png b/app/build/intermediates/res/merged/debug/drawable-hdpi-v4/marcus72.png new file mode 100644 index 0000000..4bf1db2 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-hdpi-v4/marcus72.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/binary.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/binary.png new file mode 100644 index 0000000..bf8ecfe Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/binary.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/compressed.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/compressed.png new file mode 100644 index 0000000..79598a4 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/compressed.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/folder.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/folder.png new file mode 100644 index 0000000..99d036d Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/folder.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/generic.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/generic.png new file mode 100644 index 0000000..00d3377 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/generic.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/icon.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/icon.png new file mode 100644 index 0000000..17acb72 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/icon.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/image.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/image.png new file mode 100644 index 0000000..4ea8ed3 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/image.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/link.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/link.png new file mode 100644 index 0000000..38e0e60 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/link.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/movie.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/movie.png new file mode 100644 index 0000000..0ed36f9 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/movie.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/music.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/music.png new file mode 100644 index 0000000..a4fb4d5 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/music.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/text.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/text.png new file mode 100644 index 0000000..9d311c7 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/text.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/unknown.png b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/unknown.png new file mode 100644 index 0000000..5ef9ab8 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-ldpi-v4/unknown.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-mdpi-v4/icon.png b/app/build/intermediates/res/merged/debug/drawable-mdpi-v4/icon.png new file mode 100644 index 0000000..69f659c Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-mdpi-v4/icon.png differ diff --git a/app/build/intermediates/res/merged/debug/drawable-mdpi-v4/up_arrow.png b/app/build/intermediates/res/merged/debug/drawable-mdpi-v4/up_arrow.png new file mode 100644 index 0000000..d298413 Binary files /dev/null and b/app/build/intermediates/res/merged/debug/drawable-mdpi-v4/up_arrow.png differ diff --git a/app/build/intermediates/res/merged/debug/layout/browser.xml b/app/build/intermediates/res/merged/debug/layout/browser.xml new file mode 100644 index 0000000..4ba2fe4 --- /dev/null +++ b/app/build/intermediates/res/merged/debug/layout/browser.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/res/merged/debug/layout/filerow.xml b/app/build/intermediates/res/merged/debug/layout/filerow.xml new file mode 100644 index 0000000..abede54 --- /dev/null +++ b/app/build/intermediates/res/merged/debug/layout/filerow.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build/intermediates/res/merged/debug/layout/home.xml b/app/build/intermediates/res/merged/debug/layout/home.xml new file mode 100644 index 0000000..a68954f --- /dev/null +++ b/app/build/intermediates/res/merged/debug/layout/home.xml @@ -0,0 +1,29 @@ + + +