Merge "Update AudioManager.getProperty documentation" into mnc-docs
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index c8e9402..e0a61f5 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -1110,7 +1110,7 @@
/**
* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
- * The device has professional audio level of functionality, performance, and acoustics.
+ * The device has professional audio level of functionality and performance.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_AUDIO_PRO = "android.hardware.audio.pro";
diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd
index 0f0c049..8834a2c 100644
--- a/docs/html/about/dashboards/index.jd
+++ b/docs/html/about/dashboards/index.jd
@@ -57,7 +57,7 @@
</div>
-<p style="clear:both"><em>Data collected during a 7-day period ending on October 5, 2015.
+<p style="clear:both"><em>Data collected during a 7-day period ending on November 2, 2015.
<br/>Any versions with less than 0.1% distribution are not shown.</em>
</p>
@@ -88,7 +88,7 @@
</div>
-<p style="clear:both"><em>Data collected during a 7-day period ending on October 5, 2015.
+<p style="clear:both"><em>Data collected during a 7-day period ending on November 2, 2015.
<br/>Any screen configurations with less than 0.1% distribution are not shown.</em></p>
@@ -108,7 +108,7 @@
<img alt="" style="float:right"
-src="//chart.googleapis.com/chart?chl=GL%202.0%7CGL%203.0%7CGL%203.1&chf=bg%2Cs%2C00000000&chd=t%3A57.2%2C38.1%2C4.7&chco=c4df9b%2C6fad0c&cht=p&chs=400x250">
+src="//chart.googleapis.com/chart?chl=GL%202.0%7CGL%203.0%7CGL%203.1&chf=bg%2Cs%2C00000000&chd=t%3A56.6%2C38.2%2C5.2&chco=c4df9b%2C6fad0c&cht=p&chs=400x250">
<p>To declare which version of OpenGL ES your application requires, you should use the {@code
android:glEsVersion} attribute of the <a
@@ -126,21 +126,21 @@
</tr>
<tr>
<td>2.0</td>
-<td>57.2%</td>
+<td>56.6%</td>
</tr>
<tr>
<td>3.0</td>
-<td>38.1%</td>
+<td>38.2%</td>
</tr>
<tr>
<td>3.1</td>
-<td>4.7%</td>
+<td>5.2%</td>
</tr>
</table>
-<p style="clear:both"><em>Data collected during a 7-day period ending on October 5, 2015</em></p>
+<p style="clear:both"><em>Data collected during a 7-day period ending on November 2, 2015</em></p>
@@ -154,19 +154,19 @@
"Large": {
"hdpi": "0.6",
"ldpi": "0.3",
- "mdpi": "4.8",
+ "mdpi": "4.7",
"tvdpi": "2.2",
"xhdpi": "0.6"
},
"Normal": {
- "hdpi": "41.0",
- "mdpi": "6.2",
- "tvdpi": "0.2",
- "xhdpi": "21.3",
- "xxhdpi": "15.6"
+ "hdpi": "41.3",
+ "mdpi": "6.1",
+ "tvdpi": "0.1",
+ "xhdpi": "21.7",
+ "xxhdpi": "15.3"
},
"Small": {
- "ldpi": "3.2"
+ "ldpi": "3.1"
},
"Xlarge": {
"hdpi": "0.3",
@@ -174,8 +174,8 @@
"xhdpi": "0.7"
}
},
- "densitychart": "//chart.googleapis.com/chart?chd=t%3A3.5%2C14.0%2C2.4%2C42.0%2C22.6%2C15.6&chf=bg%2Cs%2C00000000&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi&chco=c4df9b%2C6fad0c&cht=p&chs=400x250",
- "layoutchart": "//chart.googleapis.com/chart?chd=t%3A4.0%2C8.5%2C84.4%2C3.2&chf=bg%2Cs%2C00000000&chl=Xlarge%7CLarge%7CNormal%7CSmall&chco=c4df9b%2C6fad0c&cht=p&chs=400x250"
+ "densitychart": "//chart.googleapis.com/chart?chs=400x250&cht=p&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi&chco=c4df9b%2C6fad0c&chd=t%3A3.4%2C13.8%2C2.3%2C42.2%2C23.0%2C15.3&chf=bg%2Cs%2C00000000",
+ "layoutchart": "//chart.googleapis.com/chart?chs=400x250&cht=p&chl=Xlarge%7CLarge%7CNormal%7CSmall&chco=c4df9b%2C6fad0c&chd=t%3A4.0%2C8.4%2C84.5%2C3.1&chf=bg%2Cs%2C00000000"
}
];
@@ -183,7 +183,7 @@
var VERSION_DATA =
[
{
- "chart": "//chart.googleapis.com/chart?chd=t%3A0.2%2C3.8%2C3.4%2C30.2%2C38.9%2C23.5&chf=bg%2Cs%2C00000000&chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat%7CLollipop&chco=c4df9b%2C6fad0c&cht=p&chs=500x250",
+ "chart": "//chart.googleapis.com/chart?chs=500x250&cht=p&chl=Froyo%7CGingerbread%7CIce%20Cream%20Sandwich%7CJelly%20Bean%7CKitKat%7CLollipop%7CMarshmallow&chco=c4df9b%2C6fad0c&chd=t%3A0.2%2C3.8%2C3.3%2C29.0%2C37.8%2C25.6%2C0.3&chf=bg%2Cs%2C00000000",
"data": [
{
"api": 8,
@@ -198,37 +198,42 @@
{
"api": 15,
"name": "Ice Cream Sandwich",
- "perc": "3.4"
+ "perc": "3.3"
},
{
"api": 16,
"name": "Jelly Bean",
- "perc": "11.4"
+ "perc": "11.0"
},
{
"api": 17,
"name": "Jelly Bean",
- "perc": "14.5"
+ "perc": "13.9"
},
{
"api": 18,
"name": "Jelly Bean",
- "perc": "4.3"
+ "perc": "4.1"
},
{
"api": 19,
"name": "KitKat",
- "perc": "38.9"
+ "perc": "37.8"
},
{
"api": 21,
"name": "Lollipop",
- "perc": "15.6"
+ "perc": "15.5"
},
{
"api": 22,
"name": "Lollipop",
- "perc": "7.9"
+ "perc": "10.1"
+ },
+ {
+ "api": 23,
+ "name": "Marshmallow",
+ "perc": "0.3"
}
]
}
@@ -316,6 +321,11 @@
"api":22,
"link":"<a href='/about/versions/android-5.1.html'>5.1</a>",
"codename":"Lollipop"
+ },
+ {
+ "api":23,
+ "link":"<a href='/about/versions/marshmallow/index.html'>6.0</a>",
+ "codename":"Marshmallow"
}
];
diff --git a/docs/html/tools/data-binding/guide.jd b/docs/html/tools/data-binding/guide.jd
index bb5e092..9629bb02 100644
--- a/docs/html/tools/data-binding/guide.jd
+++ b/docs/html/tools/data-binding/guide.jd
@@ -145,7 +145,7 @@
— it's a support library, so you can use it with all Android platform
versions back to <strong>Android 2.1</strong> (API level 7+).</p>
-<p>To use data binding, Android Plugin for Gradle <strong>1.3.0-beta4</strong>
+<p>To use data binding, Android Plugin for Gradle <strong>1.5.0-alpha1</strong>
or higher is required.</p>
<h4>Beta release</h4>
@@ -191,55 +191,29 @@
<p>To get started with Data Binding, download the library from the Support
repository in the Android SDK manager. </p>
-<p>The Data Binding plugin requires Android Plugin for Gradle <strong>1.3.0-beta4
-or higher</strong>, so update your build dependencies (in the top-level
-<code>build.gradle</code> file) as needed.</p>
+<p>
+To configure your app to use data binding, add the <code>dataBinding</code> element to your
+<code>build.gradle</code> file in the app module.
+</p>
+
+ <p>Use the following code snippet to configure data binding: </p>
+
+<pre>
+android {
+ ....
+ dataBinding {
+ enabled = true
+ }
+}
+</pre>
+
+<p>If you have an app module that depends on a library which uses data binding, your app module
+ must configure data binding in its <code>build.gradle</code> file as well.</p>
<p>Also, make sure you are using a compatible version of Android Studio.
<strong>Android Studio 1.3</strong> adds the code-completion and layout-preview
support for data binding.</p>
-<p>
- <strong>Setting Up Work Environment:</strong>
-</p>
-
-<p>
- To set up your application to use data binding, add data binding to the class
- path of your top-level <code>build.gradle</code> file, right below "android".
-</p>
-
-<pre>
- dependencies {
- classpath <strong>"com.android.tools.build:gradle:1.3.0-beta4"</strong>
- classpath <strong>"com.android.databinding:dataBinder:1.0-rc1"</strong>
- }
-</pre>
-<p>
- Then make sure jcenter is in the repositories list for your projects in the top-level
- <code>build.gradle</code> file.
-</p>
-
-<pre>
-allprojects {
- repositories {
- jcenter()
- }
-}
-</pre>
-<p>
- In each module you want to use data binding, apply the plugin right after
- android plugin
-</p>
-
-<pre>
-apply plugin: 'com.android.application'
-apply plugin: 'com.android.databinding'
-</pre>
-<p>
- The data binding plugin is going to add necessary <strong>provided</strong>
- and <strong>compile configuration</strong> dependencies to your project.
-</p>
-
<h2 id="data_binding_layout_files">
Data Binding Layout Files
</h2>
diff --git a/docs/html/training/articles/perf-anr.jd b/docs/html/training/articles/perf-anr.jd
index 1fd56ee..bbebec5 100644
--- a/docs/html/training/articles/perf-anr.jd
+++ b/docs/html/training/articles/perf-anr.jd
@@ -91,7 +91,7 @@
resizing bitmaps should be done in a worker thread (or in the case of databases
operations, via an asynchronous request).</p>
-<p>The most effecive way to create a worker thread for longer
+<p>The most effective way to create a worker thread for longer
operations is with the {@link android.os.AsyncTask}
class. Simply extend {@link android.os.AsyncTask} and implement the
{@link android.os.AsyncTask#doInBackground doInBackground()} method to perform the work.
diff --git a/docs/html/training/permissions/best-practices.jd b/docs/html/training/permissions/best-practices.jd
index 46521cb..b22c8b0 100644
--- a/docs/html/training/permissions/best-practices.jd
+++ b/docs/html/training/permissions/best-practices.jd
@@ -226,7 +226,7 @@
</li>
<li>Use the <a href="{@docRoot}tools/help/adb.html">adb</a> tool to manage
- permssions from the command line:
+ permissions from the command line:
<ul>
<li>List permissions and status by group:
diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java
index 7f22b8a..45529ef 100644
--- a/media/java/android/media/AudioDeviceInfo.java
+++ b/media/java/android/media/AudioDeviceInfo.java
@@ -221,8 +221,9 @@
* @return An array of audio encodings (e.g. {@link AudioFormat#ENCODING_PCM_16BIT},
* {@link AudioFormat#ENCODING_PCM_FLOAT}) supported by the audio device.
* <code>ENCODING_PCM_FLOAT</code> indicates the device supports more
- * than 16 bits of integer precision. Specifying <code>ENCODING_PCM_FLOAT</code>
- * with {@link AudioTrack} or {@link AudioRecord} can preserve at least 24 bits of
+ * than 16 bits of integer precision. As there is no AudioFormat constant
+ * specifically defined for 24-bit PCM, the value <code>ENCODING_PCM_FLOAT</code>
+ * indicates that {@link AudioTrack} or {@link AudioRecord} can preserve at least 24 bits of
* integer precision to that device.
*
* @see AudioFormat