3 files changed, 20 insertions, 18 deletions

diff --git a/docs/html/guide/topics/data/backup.jd b/docs/html/guide/topics/data/backup.jd
index f09ff9e..5710a47 100644
--- a/docs/html/guide/topics/data/backup.jd
+++ b/docs/html/guide/topics/data/backup.jd
@@ -643,7 +643,8 @@ public class MyPrefsBackupAgent extends BackupAgentHelper {
     // Allocate a helper and add it to the backup agent
     @Override
     public void onCreate() {
-        SharedPreferencesBackupHelper helper = new SharedPreferencesBackupHelper(this, PREFS);
+        SharedPreferencesBackupHelper helper =
+                new SharedPreferencesBackupHelper(this, PREFS);
         addHelper(PREFS_BACKUP_KEY, helper);
     }
 }
@@ -688,8 +689,10 @@ public class MyFileBackupAgent extends BackupAgentHelper {
     static final String FILES_BACKUP_KEY = "myfiles";
 
     // Allocate a helper and add it to the backup agent
-    void onCreate() {
-        FileBackupHelper helper = new FileBackupHelper(this, TOP_SCORES, PLAYER_STATS);
+    @Override
+    public void onCreate() {
+        FileBackupHelper helper = new FileBackupHelper(this,
+                TOP_SCORES, PLAYER_STATS);
         addHelper(FILES_BACKUP_KEY, helper);
     }
 }
diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd
index 1ee6606..0a96a15 100644
--- a/docs/html/guide/topics/resources/localization.jd
+++ b/docs/html/guide/topics/resources/localization.jd
@@ -433,8 +433,8 @@ application, however, should localize properly.</p>
 <p>To change the locale in the emulator by using the adb shell. </p>

 

 <ol>

-  <li>Pick the locale you want to test and determine its language and region codes, for

-example <code>fr</code> for French and <code>CA</code> for Canada.<br>

+  <li>Pick the locale you want to test and determine its BCP-47 language tag, for

+example, Canadian French would be <code>fr-CA</code>.<br>

   </li>

   <li>Launch an emulator.</li>

   <li>From a command-line shell on the host computer, run the following

@@ -444,16 +444,14 @@ command:<br>
 the <code>-e</code> option:<br>

   <code>adb -e shell</code></li>

   <li>At  the  adb shell prompt (<code>#</code>), run this command: <br>

-    <code>setprop persist.sys.language  [<em>language code</em>];setprop

-persist.sys.country [<em>country  code</em>];stop;sleep 5;start <br>

+    <code>setprop persist.sys.locale [<em>BCP-47 language tag</em>];stop;sleep 5;start <br>

     </code>Replace bracketed sections with the  appropriate codes from Step

 1.</li>

 </ol>

 

 <p>For instance, to test in Canadian French:</p>

 

-<p><code>setprop persist.sys.language  fr;setprop persist.sys.country

-CA;stop;sleep 5;start </code></p>

+<p><code>setprop persist.sys.locale fr-CA;stop;sleep 5;start </code></p>

 

 <p>This will cause the emulator  to restart. (It will look like a full reboot,

 but it is not.) Once the Home screen appears again, re-launch your application (for

diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd
index e47c77e..976115e 100644
--- a/docs/html/guide/topics/ui/notifiers/notifications.jd
+++ b/docs/html/guide/topics/ui/notifiers/notifications.jd
@@ -663,20 +663,21 @@ mNotificationManager.notify(id, builder.build());
 NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
 // Creates an Intent for the Activity
 Intent notifyIntent =
-        new Intent(new ComponentName(this, ResultActivity.class));
+        new Intent(this, ResultActivity.class);
 // Sets the Activity to start in a new, empty task
-notifyIntent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+notifyIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
 // Creates the PendingIntent
-PendingIntent notifyIntent =
+PendingIntent notifyPendingIntent =
         PendingIntent.getActivity(
         this,
         0,
-        notifyIntent
+        notifyIntent,
         PendingIntent.FLAG_UPDATE_CURRENT
 );
 
 // Puts the PendingIntent into the notification builder
-builder.setContentIntent(notifyIntent);
+builder.setContentIntent(notifyPendingIntent);
 // Notifications are issued by sending them to the
 // NotificationManager system service.
 NotificationManager mNotificationManager =
@@ -715,7 +716,7 @@ mNotificationManager.notify(id, builder.build());
 <h3 id="FixedProgress">Displaying a fixed-duration progress indicator</h3>
 <p>
     To display a determinate progress bar, add the bar to your notification by calling
-    {@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()
+    {@link android.support.v4.app.NotificationCompat.Builder#setProgress
     setProgress(max, progress, false)} and then issue the notification. As your operation proceeds,
     increment <code>progress</code>, and update the notification. At the end of the operation,
     <code>progress</code> should equal <code>max</code>. A common way to call
@@ -727,7 +728,7 @@ mNotificationManager.notify(id, builder.build());
     You can either leave the progress bar showing when the operation is done, or remove it. In
     either case, remember to update the notification text to show that the operation is complete.
     To remove the progress bar, call
-    {@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()
+    {@link android.support.v4.app.NotificationCompat.Builder#setProgress
     setProgress(0, 0, false)}. For example:
 </p>
 <pre>
@@ -783,8 +784,8 @@ new Thread(
 <p>
     Issue the notification at the beginning of the operation. The animation will run until you
     modify your notification. When the operation is done, call
-    {@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress()
-    setProgress(0, 0, false)} and then update the notification to remove the activity indicator.
+    {@link android.support.v4.app.NotificationCompat.Builder#setProgress setProgress(0, 0, false)}
+    and then update the notification to remove the activity indicator.
     Always do this; otherwise, the animation will run even when the operation is complete. Also
     remember to change the notification text to indicate that the operation is complete.
 </p>