Skip to content

Commit fd51698

Browse files
committed
docs: misc bugs from external tracker
Change-Id: I02d0d82c220401ac3a1ca180e8331a0f6dcd9e50
1 parent 099fd80 commit fd51698

File tree

7 files changed

+19
-715
lines changed

7 files changed

+19
-715
lines changed

core/java/android/app/DialogFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
*
6161
* <p>DialogFragment needs to ensure that what is happening with the Fragment
6262
* and Dialog states remains consistent. To do this, it watches for dismiss
63-
* events from the dialog and takes are of removing its own state when they
63+
* events from the dialog and takes care of removing its own state when they
6464
* happen. This means you should use {@link #show(FragmentManager, String)}
6565
* or {@link #show(FragmentTransaction, String)} to add an instance of
6666
* DialogFragment to your UI, as these keep track of how DialogFragment should

docs/html/guide/components/intents-filters.jd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -654,8 +654,8 @@ category:
654654
</p>
655655

656656
<pre>&lt;intent-filter . . . &gt;
657-
&lt;action android:name="code android.intent.action.MAIN" /&gt;
658-
&lt;category android:name="code android.intent.category.LAUNCHER" /&gt;
657+
&lt;action android:name="android.intent.action.MAIN" /&gt;
658+
&lt;category android:name="android.intent.category.LAUNCHER" /&gt;
659659
&lt;/intent-filter&gt;</pre>
660660

661661

docs/html/guide/topics/ui/dialogs.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ TimePicker</a></li>
4747

4848
<p>A dialog is usually a small window that appears in front of the current Activity.
4949
The underlying Activity loses focus and the dialog accepts all user interaction. Dialogs are
50-
normally used for notifications that should interupt the user and to perform short tasks that
50+
normally used for notifications that should interrupt the user and to perform short tasks that
5151
directly relate to the application in progress (such as a progress bar or a login prompt).</p>
5252

5353
<p>The {@link android.app.Dialog} class is the base class for creating dialogs. However, you

docs/html/sitemap.txt

Lines changed: 1 addition & 697 deletions
Large diffs are not rendered by default.

docs/html/training/basics/intents/sending.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ emailIntent.setType(HTTP.PLAIN_TEXT_TYPE);
112112
emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[] {"jon@example.com"}); // recipients
113113
emailIntent.putExtra(Intent.EXTRA_SUBJECT, "Email subject");
114114
emailIntent.putExtra(Intent.EXTRA_TEXT, "Email message text");
115-
emailIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://path/to/email/attachment");
115+
emailIntent.putExtra(Intent.EXTRA_STREAM, Uri.parse("content://path/to/email/attachment"));
116116
// You can also attach multiple items by passing an ArrayList of Uris
117117
</pre>
118118
</li>

docs/html/training/basics/supporting-devices/languages.jd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ locale currently set for the user's device.</p>
9292
<pre>
9393
&lt;?xml version="1.0" encoding="utf-8"?>
9494
&lt;resources>
95-
&lt;string name="title">Ma Application&lt;/string>
96-
&lt;string name="hello_world">Bonjour tout le Monde!&lt;/string>
95+
&lt;string name="title">Mon Application&lt;/string>
96+
&lt;string name="hello_world">Bonjour le monde !&lt;/string>
9797
&lt;/resources>
9898
</pre>
9999

docs/html/training/cloudsync/aesync.jd

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ public Task find(Long id) {
224224
PersistenceManager pm = PMF.get().getPersistenceManager();
225225
try {
226226
Query query = pm.newQuery("select from " + Task.class.getName()
227-
+ " where id==" + id.toString() + " && emailAddress=='" + getUserEmail() + "'");
228-
List<Task> list = (List<Task>) query.execute();
227+
+ " where id==" + id.toString() + " &amp;&amp; emailAddress=='" + getUserEmail() + "'");
228+
List&lt;Task> list = (List&lt;Task>) query.execute();
229229
return list.size() == 0 ? null : list.get(0);
230230
} catch (RuntimeException e) {
231231
System.out.println(e);
@@ -273,24 +273,24 @@ like this:</p>
273273
public void fetchTasks (Long id) {
274274
// Request is wrapped in an AsyncTask to avoid making a network request
275275
// on the UI thread.
276-
new AsyncTask<Long, Void, List<TaskProxy>>() {
276+
new AsyncTask&lt;Long, Void, List&lt;TaskProxy>>() {
277277
&#64;Override
278-
protected List<TaskProxy> doInBackground(Long... arguments) {
279-
final List<TaskProxy> list = new ArrayList<TaskProxy>();
278+
protected List&lt;TaskProxy> doInBackground(Long... arguments) {
279+
final List&lt;TaskProxy> list = new ArrayList&lt;TaskProxy>();
280280
MyRequestFactory factory = Util.getRequestFactory(mContext,
281281
MyRequestFactory.class);
282282
TaskRequest taskRequest = factory.taskNinjaRequest();
283283

284284
if (arguments.length == 0 || arguments[0] == -1) {
285-
factory.taskRequest().queryTasks().fire(new Receiver<List<TaskProxy>>() {
285+
factory.taskRequest().queryTasks().fire(new Receiver&lt;List&lt;TaskProxy>>() {
286286
&#64;Override
287-
public void onSuccess(List<TaskProxy> arg0) {
287+
public void onSuccess(List&lt;TaskProxy> arg0) {
288288
list.addAll(arg0);
289289
}
290290
});
291291
} else {
292292
newTask = true;
293-
factory.taskRequest().readTask(arguments[0]).fire(new Receiver<TaskProxy>() {
293+
factory.taskRequest().readTask(arguments[0]).fire(new Receiver&lt;TaskProxy>() {
294294
&#64;Override
295295
public void onSuccess(TaskProxy arg0) {
296296
list.add(arg0);
@@ -301,15 +301,15 @@ public void fetchTasks (Long id) {
301301
}
302302

303303
&#64;Override
304-
protected void onPostExecute(List<TaskProxy> result) {
304+
protected void onPostExecute(List&lt;TaskProxy> result) {
305305
TaskNinjaActivity.this.dump(result);
306306
}
307307

308308
}.execute(id);
309309
}
310310
...
311311

312-
public void dump (List<TaskProxy> tasks) {
312+
public void dump (List&lt;TaskProxy> tasks) {
313313
for (TaskProxy task : tasks) {
314314
Log.i("Task output", task.getName() + "\n" + task.getNote());
315315
}
@@ -331,7 +331,7 @@ call its update method. Once again, this should be done in an
331331
result looks something like this.</p>
332332

333333
<pre>
334-
new AsyncTask<Void, Void, Void>() {
334+
new AsyncTask&lt;Void, Void, Void>() {
335335
&#64;Override
336336
protected Void doInBackground(Void... arg0) {
337337
MyRequestFactory factory = (MyRequestFactory)

0 commit comments

Comments
 (0)