diff --git a/README.md b/README.md
index 7136aa965e..c6935075ac 100644
--- a/README.md
+++ b/README.md
@@ -5,29 +5,29 @@
ExoPlayer is an application level media player for Android. It provides an
alternative to Android’s MediaPlayer API for playing audio and video both
locally and over the Internet. ExoPlayer supports features not currently
-supported by Android’s MediaPlayer API (as of KitKat), including DASH and
-SmoothStreaming adaptive playbacks, persistent caching and custom renderers.
-Unlike the MediaPlayer API, ExoPlayer is easy to customize and extend, and
-can be updated through Play Store application updates.
+supported by Android’s MediaPlayer API, including DASH and SmoothStreaming
+adaptive playbacks. Unlike the MediaPlayer API, ExoPlayer is easy to
+customize and extend, and can be updated through Play Store application
+updates.
-## Blog ##
+## News ##
-Read news, hints and tips in the ExoPlayer [blog][].
+Read news, hints and tips on the [news][] page.
-[blog]: https://google.github.io/ExoPlayer/blog.html
+[news]: https://google.github.io/ExoPlayer/news.html
## Developer guide ##
-The ExoPlayer [developer guide][] provides a wealth of information to help
-you get started.
+The [developer guide][] provides a wealth of information to help you get
+started.
[developer guide]: https://google.github.io/ExoPlayer/guide.html
## Reference documentation ##
-The Exoplayer [class reference][] documents the ExoPlayer library classes.
+The [class reference][] documents the ExoPlayer library classes.
-[class reference]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/package-summary.html
+[class reference]: https://google.github.io/ExoPlayer/doc/reference
## Project branches ##
diff --git a/build.gradle b/build.gradle
index a342c5673b..fab548dc65 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.2.2'
+ classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.novoda:bintray-release:0.2.7'
}
}
diff --git a/library/build.gradle b/library/build.gradle
index 9518cdd896..9610ad4d76 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -54,6 +54,21 @@ android.libraryVariants.all { variant ->
artifacts.add('archives', task);
}
+android.libraryVariants.all { variant ->
+ task("generate${variant.name.capitalize()}Javadoc", type: Javadoc) {
+ title = "ExoPlayer library"
+ description "Generates Javadoc for $variant.name."
+ source = variant.javaCompile.source
+ classpath = files(variant.javaCompile.classpath.files, project.android.getBootClasspath())
+ options {
+ links "http://docs.oracle.com/javase/7/docs/api/"
+ linksOffline "https://d.android.com/reference","${android.sdkDirectory}/docs/reference"
+ }
+ exclude '**/BuildConfig.java'
+ exclude '**/R.java'
+ }
+}
+
publish {
repoName = 'exoplayer'
userOrg = 'google'
diff --git a/library/doc/images/exoplayer_diagrams.svg b/library/doc/images/exoplayer_diagrams.svg
deleted file mode 100644
index 6a703263a9..0000000000
--- a/library/doc/images/exoplayer_diagrams.svg
+++ /dev/null
@@ -1,2126 +0,0 @@
-
-
diff --git a/library/doc/images/exoplayer_playbackstate.png b/library/doc/images/exoplayer_playbackstate.png
deleted file mode 100644
index fb0ba72a60..0000000000
Binary files a/library/doc/images/exoplayer_playbackstate.png and /dev/null differ
diff --git a/library/doc/images/exoplayer_state.png b/library/doc/images/exoplayer_state.png
deleted file mode 100644
index d37a51e23a..0000000000
Binary files a/library/doc/images/exoplayer_state.png and /dev/null differ
diff --git a/library/doc/images/exoplayer_threading_model.png b/library/doc/images/exoplayer_threading_model.png
deleted file mode 100644
index 9f0306c111..0000000000
Binary files a/library/doc/images/exoplayer_threading_model.png and /dev/null differ
diff --git a/library/doc/images/trackrenderer_state.png b/library/doc/images/trackrenderer_state.png
deleted file mode 100644
index 604a447a6a..0000000000
Binary files a/library/doc/images/trackrenderer_state.png and /dev/null differ
diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayer.java b/library/src/main/java/com/google/android/exoplayer/ExoPlayer.java
index 1eecc358e1..a0b544062a 100644
--- a/library/src/main/java/com/google/android/exoplayer/ExoPlayer.java
+++ b/library/src/main/java/com/google/android/exoplayer/ExoPlayer.java
@@ -52,7 +52,7 @@ import android.os.Looper;
*
Threading model
*
*
The figure below shows the {@link ExoPlayer} threading model.
- *
*
@@ -79,14 +79,14 @@ import android.os.Looper;
* have been performed asynchronously by the playback thread. In contrast, the playback state
* accessed by {@link #getPlaybackState()} is only ever changed as a result of operations
* completing on the playback thread, as illustrated below.
- *
*
*
The possible playback state transitions are shown below. Transitions can be triggered either
* by changes in the state of the {@link TrackRenderer}s being used, or as a result of
* {@link #prepare(TrackRenderer[])}, {@link #stop()} or {@link #release()} being invoked.
- *
*/
diff --git a/library/src/main/java/com/google/android/exoplayer/TrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/TrackRenderer.java
index b28a2fbc9d..3b8b4f372b 100644
--- a/library/src/main/java/com/google/android/exoplayer/TrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/TrackRenderer.java
@@ -25,7 +25,7 @@ import com.google.android.exoplayer.util.Assertions;
* will transition its renderers through various states as the overall playback state changes. The
* valid state transitions are shown below, annotated with the methods that are invoked during each
* transition.
- *
