Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 490b5791 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am d472ad74: Merge branch \'jb-mr2-dev-plus-aosp\' of... 

am d472ad74: Merge branch \'jb-mr2-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into jb-mr2-dev-plus-aosp

* commit 'd472ad74':
  Doc update: clean up ubiquitous typo "the the"
parents 96242a1b d472ad74

docs/html/about/versions/jelly-bean.jd

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the 


<h3>Media codec access</h3>



<p>Android 4.1 provides low-level access to platform hardware and software codecs. Apps can query the system to discover what <strong>low-level media codecs</strong> are available on the device and then and use them in the ways they need. For example, you can now create multiple instances of a media codec, queue input buffers, and receive output buffers in return. In addition, the media codec framework supports protected content. Apps can query for an available codec that is able to play protected content with a DRM solution available on the the device.</p>

<p>Android 4.1 provides low-level access to platform hardware and software codecs. Apps can query the system to discover what <strong>low-level media codecs</strong> are available on the device and then and use them in the ways they need. For example, you can now create multiple instances of a media codec, queue input buffers, and receive output buffers in return. In addition, the media codec framework supports protected content. Apps can query for an available codec that is able to play protected content with a DRM solution available on the device.</p>



<h3>USB Audio</h3>

docs/html/distribute/googleplay/about/visibility.jd

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ style="font-weight:500;">Growth in app consumption</span>: Users download more t 
</div>



<div>

<p>Google Play is also a top destination for visitors from the the web. Anyone

<p>Google Play is also a top destination for visitors from the web. Anyone

with a browser can explore everything that Google Play has to offer from its <a

href="http://play.google.com/store">web site</a>. Android users can even buy and

install the apps they want and Google Play pushes them automatically to their
@@ -159,7 +159,7 @@ the editorial team will notice.</p> 


<h4>Featured and Staff Picks</h4>



<p>Each week the the Google Play editorial staff selects a new set of apps to

<p>Each week the Google Play editorial staff selects a new set of apps to

promote in its popular <em>Featured</em> and <em>Staff Picks</em> collections.

</p>

docs/html/guide/components/fundamentals.jd

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ receivers can be either declared in the manifest or created dynamically in code 
{@link android.content.BroadcastReceiver} objects) and registered with the system by calling

{@link android.content.Context#registerReceiver registerReceiver()}.</p>



<p>For more about how to structure the manifest file for your application, see the <a

<p>For more about how to structure the manifest file for your application, see <a

href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a>

documentation. </p>

docs/html/guide/components/tasks-and-back-stack.jd

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ activities except for the root activity when the user leaves the task.</p> 
&lt;activity&gt;}</a> manifest element and with flags in the intent that you pass to {@link

android.app.Activity#startActivity startActivity()}.</p>



<p>In this regard, the the principal <a

<p>In this regard, the principal <a

href="{@docRoot}guide/topics/manifest/activity-element.html">{@code &lt;activity&gt;}</a>

attributes you can use are:</p>
@@ -319,7 +319,7 @@ each instance can belong to different tasks, and one task can have multiple inst 
routes the intent to that instance through a call to its {@link

android.app.Activity#onNewIntent onNewIntent()} method, rather than creating a new instance of the

activity. The activity can be instantiated multiple times, each instance can

belong to different tasks, and one task can have multiple instances (but only if the the

belong to different tasks, and one task can have multiple instances (but only if the

activity at the top of the back stack is <em>not</em> an existing instance of the activity).

  <p>For example, suppose a task's back stack consists of root activity A with activities B, C,

and D on top (the stack is A-B-C-D; D is on top). An intent arrives for an activity of type D.

docs/html/guide/topics/admin/device-admin.jd

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ a label.</li> 
</code> is a permission that a {@link android.app.admin.DeviceAdminReceiver} subclass must

have, to ensure that only the system can interact with the receiver (no application can be granted this permission). This

prevents other applications from abusing your device admin app.</li>

<li><code>android.app.action.DEVICE_ADMIN_ENABLED</code> is the  the primary

<li><code>android.app.action.DEVICE_ADMIN_ENABLED</code> is the primary

action that a {@link android.app.admin.DeviceAdminReceiver} subclass must handle to be

allowed to manage a device. This is set to the receiver when the user enables

the device admin app. Your code typically handles this in