summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/topics/manifest/uses-feature-element.jd16
-rw-r--r--docs/html/guide/topics/ui/settings.jd2
2 files changed, 17 insertions, 1 deletions
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index b040898..2385592 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -593,6 +593,22 @@ external camera device if one is connected. Use this in preference to
<td><code>android.hardware.camera.external</code></td>
<td>The application uses an external camera device if one is connected.</td>
</tr>
+<tr>
+ <td><code>android.hardware.camera.level.full</code></td>
+ <td>The application uses a camera device with <code>FULL</code>-level support.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.manual_sensor</code></td>
+ <td>The application uses a a camera device with the <code>MANUAL_SENSOR</code> capability.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.manual_post_processing</code></td>
+ <td>The application uses a a camera device with the <code>MANUAL_POST_PROCESSING</code> capability.</td>
+</tr>
+<tr>
+ <td><code>android.hardware.camera.capability.raw</code></td>
+ <td>The application uses a a camera device with the <code>RAW</code> capability.</td>
+</tr>
<tr>
<td>Infrared</td>
diff --git a/docs/html/guide/topics/ui/settings.jd b/docs/html/guide/topics/ui/settings.jd
index f454c4e..02f1255 100644
--- a/docs/html/guide/topics/ui/settings.jd
+++ b/docs/html/guide/topics/ui/settings.jd
@@ -801,7 +801,7 @@ String syncConnPref = sharedPref.getString(SettingsActivity.KEY_PREF_SYNC_CONN,
<h3 id="Listening">Listening for preference changes</h3>
-<p>There are several reasons you might want to be notified as soon as the use changes one of the
+<p>There are several reasons you might want to be notified as soon as the user changes one of the
preferences. In order to receive a callback when a change happens to any one of the preferences,
implement the {@link android.content.SharedPreferences.OnSharedPreferenceChangeListener
SharedPreference.OnSharedPreferenceChangeListener} interface and register the listener for the