From e1d6f8618bf3f7af80a925f4ac5919885d43ade2 Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Tue, 29 Sep 2015 21:51:45 +0100 Subject: [PATCH] Package restructuring --- .../{webm_sw_decoder => vp9_opus_sw}/README.md | 0 .../{webm_sw_decoder => vp9_opus_sw}/build.gradle | 0 .../src/main/.classpath | 0 .../src/main/.project | 2 +- .../src/main/AndroidManifest.xml | 0 .../exoplayer/demo/webm/DashRendererBuilder.java | 0 .../exoplayer/demo/webm/FilePickerActivity.java | 0 .../exoplayer/demo/webm/SampleChooserActivity.java | 0 .../android/exoplayer/demo/webm/VideoPlayer.java | 0 .../src/main/project.properties | 0 .../src/main/res/drawable-hdpi/ic_launcher.png | Bin .../src/main/res/drawable-mdpi/ic_launcher.png | Bin .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin .../src/main/res/drawable-xxhdpi/ic_launcher.png | Bin .../src/main/res/drawable-xxxhdpi/ic_launcher.png | Bin .../src/main/res/layout/activity_video_player.xml | 0 .../src/main/res/layout/file_picker_activity.xml | 0 .../src/main/res/layout/rows.xml | 0 .../src/main/res/layout/sample_chooser_activity.xml | 0 .../res/layout/sample_chooser_inline_header.xml | 0 .../src/main/res/values-v11/styles.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 settings.gradle | 4 ++-- 24 files changed, 3 insertions(+), 3 deletions(-) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/README.md (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/build.gradle (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/.classpath (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/.project (94%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/AndroidManifest.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/java/com/google/android/exoplayer/demo/webm/SampleChooserActivity.java (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/project.properties (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/drawable-hdpi/ic_launcher.png (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/drawable-mdpi/ic_launcher.png (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/drawable-xhdpi/ic_launcher.png (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/drawable-xxhdpi/ic_launcher.png (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/drawable-xxxhdpi/ic_launcher.png (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/layout/activity_video_player.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/layout/file_picker_activity.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/layout/rows.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/layout/sample_chooser_activity.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/layout/sample_chooser_inline_header.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/values-v11/styles.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/values/strings.xml (100%) rename demo_misc/{webm_sw_decoder => vp9_opus_sw}/src/main/res/values/styles.xml (100%) diff --git a/demo_misc/webm_sw_decoder/README.md b/demo_misc/vp9_opus_sw/README.md similarity index 100% rename from demo_misc/webm_sw_decoder/README.md rename to demo_misc/vp9_opus_sw/README.md diff --git a/demo_misc/webm_sw_decoder/build.gradle b/demo_misc/vp9_opus_sw/build.gradle similarity index 100% rename from demo_misc/webm_sw_decoder/build.gradle rename to demo_misc/vp9_opus_sw/build.gradle diff --git a/demo_misc/webm_sw_decoder/src/main/.classpath b/demo_misc/vp9_opus_sw/src/main/.classpath similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/.classpath rename to demo_misc/vp9_opus_sw/src/main/.classpath diff --git a/demo_misc/webm_sw_decoder/src/main/.project b/demo_misc/vp9_opus_sw/src/main/.project similarity index 94% rename from demo_misc/webm_sw_decoder/src/main/.project rename to demo_misc/vp9_opus_sw/src/main/.project index 4a01439be8..1b6d3fd5ba 100644 --- a/demo_misc/webm_sw_decoder/src/main/.project +++ b/demo_misc/vp9_opus_sw/src/main/.project @@ -1,6 +1,6 @@ - ExoPlayerExt-WebMDemo + ExoPlayerDemoMisc-Vp9OpusSw diff --git a/demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml b/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/AndroidManifest.xml rename to demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java b/demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java rename to demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java b/demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java rename to demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/SampleChooserActivity.java b/demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/SampleChooserActivity.java similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/SampleChooserActivity.java rename to demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/SampleChooserActivity.java diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java b/demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java rename to demo_misc/vp9_opus_sw/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java diff --git a/demo_misc/webm_sw_decoder/src/main/project.properties b/demo_misc/vp9_opus_sw/src/main/project.properties similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/project.properties rename to demo_misc/vp9_opus_sw/src/main/project.properties diff --git a/demo_misc/webm_sw_decoder/src/main/res/drawable-hdpi/ic_launcher.png b/demo_misc/vp9_opus_sw/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/drawable-hdpi/ic_launcher.png rename to demo_misc/vp9_opus_sw/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/demo_misc/webm_sw_decoder/src/main/res/drawable-mdpi/ic_launcher.png b/demo_misc/vp9_opus_sw/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/drawable-mdpi/ic_launcher.png rename to demo_misc/vp9_opus_sw/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/demo_misc/webm_sw_decoder/src/main/res/drawable-xhdpi/ic_launcher.png b/demo_misc/vp9_opus_sw/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/drawable-xhdpi/ic_launcher.png rename to demo_misc/vp9_opus_sw/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/demo_misc/webm_sw_decoder/src/main/res/drawable-xxhdpi/ic_launcher.png b/demo_misc/vp9_opus_sw/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/drawable-xxhdpi/ic_launcher.png rename to demo_misc/vp9_opus_sw/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/demo_misc/webm_sw_decoder/src/main/res/drawable-xxxhdpi/ic_launcher.png b/demo_misc/vp9_opus_sw/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/drawable-xxxhdpi/ic_launcher.png rename to demo_misc/vp9_opus_sw/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/demo_misc/webm_sw_decoder/src/main/res/layout/activity_video_player.xml b/demo_misc/vp9_opus_sw/src/main/res/layout/activity_video_player.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/layout/activity_video_player.xml rename to demo_misc/vp9_opus_sw/src/main/res/layout/activity_video_player.xml diff --git a/demo_misc/webm_sw_decoder/src/main/res/layout/file_picker_activity.xml b/demo_misc/vp9_opus_sw/src/main/res/layout/file_picker_activity.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/layout/file_picker_activity.xml rename to demo_misc/vp9_opus_sw/src/main/res/layout/file_picker_activity.xml diff --git a/demo_misc/webm_sw_decoder/src/main/res/layout/rows.xml b/demo_misc/vp9_opus_sw/src/main/res/layout/rows.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/layout/rows.xml rename to demo_misc/vp9_opus_sw/src/main/res/layout/rows.xml diff --git a/demo_misc/webm_sw_decoder/src/main/res/layout/sample_chooser_activity.xml b/demo_misc/vp9_opus_sw/src/main/res/layout/sample_chooser_activity.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/layout/sample_chooser_activity.xml rename to demo_misc/vp9_opus_sw/src/main/res/layout/sample_chooser_activity.xml diff --git a/demo_misc/webm_sw_decoder/src/main/res/layout/sample_chooser_inline_header.xml b/demo_misc/vp9_opus_sw/src/main/res/layout/sample_chooser_inline_header.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/layout/sample_chooser_inline_header.xml rename to demo_misc/vp9_opus_sw/src/main/res/layout/sample_chooser_inline_header.xml diff --git a/demo_misc/webm_sw_decoder/src/main/res/values-v11/styles.xml b/demo_misc/vp9_opus_sw/src/main/res/values-v11/styles.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/values-v11/styles.xml rename to demo_misc/vp9_opus_sw/src/main/res/values-v11/styles.xml diff --git a/demo_misc/webm_sw_decoder/src/main/res/values/strings.xml b/demo_misc/vp9_opus_sw/src/main/res/values/strings.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/values/strings.xml rename to demo_misc/vp9_opus_sw/src/main/res/values/strings.xml diff --git a/demo_misc/webm_sw_decoder/src/main/res/values/styles.xml b/demo_misc/vp9_opus_sw/src/main/res/values/styles.xml similarity index 100% rename from demo_misc/webm_sw_decoder/src/main/res/values/styles.xml rename to demo_misc/vp9_opus_sw/src/main/res/values/styles.xml diff --git a/settings.gradle b/settings.gradle index cdcbd1d140..8d0d2823bf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -13,13 +13,13 @@ // limitations under the License. include ':library' include ':demo' -include ':demo-misc-webm-sw' +include ':demo-misc-vp9-opus-sw' include ':playbacktests' include ':extension-opus' include ':extension-vp9' include ':extension-okhttp' -project(':demo-misc-webm-sw').projectDir = new File(settingsDir, 'demo_misc/webm_sw_decoder') +project(':demo-misc-vp9-opus-sw').projectDir = new File(settingsDir, 'demo_misc/vp9_opus_sw') project(':extension-opus').projectDir = new File(settingsDir, 'extensions/opus') project(':extension-vp9').projectDir = new File(settingsDir, 'extensions/vp9') project(':extension-okhttp').projectDir = new File(settingsDir, 'extensions/okhttp')