diff options
Diffstat (limited to 'docs/html/guide/topics')
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 9 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/application-element.jd | 6 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 20 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-sdk-element.jd | 9 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/layout/grid.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/layout/gridview.jd | 9 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/settings.jd | 2 |
7 files changed, 43 insertions, 14 deletions
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index c1256f9..99e64d9 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -13,10 +13,11 @@ parent.link=manifest-intro.html android:<a href="#clear">clearTaskOnLaunch</a>=["true" | "false"] android:<a href="#config">configChanges</a>=["mcc", "mnc", "locale", "touchscreen", "keyboard", "keyboardHidden", - "navigation", "screenLayout", "fontScale", "uiMode", - "orientation", "screenSize", "smallestScreenSize"] - android:<a href="#dlmode">documentLaunchMode</a>=["intoExisting", "always", - "none", "never"] + "navigation", "screenLayout", "fontScale", + "uiMode", "orientation", "screenSize", + "smallestScreenSize"] + android:<a href="#dlmode">documentLaunchMode</a>=["intoExisting" | "always" | + "none" | "never"] android:<a href="#enabled">enabled</a>=["true" | "false"] android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"] android:<a href="#exported">exported</a>=["true" | "false"] diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd index 8a0e837..b5af9c3 100644 --- a/docs/html/guide/topics/manifest/application-element.jd +++ b/docs/html/guide/topics/manifest/application-element.jd @@ -449,9 +449,13 @@ href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.< <dt><a name="vmSafeMode"></a>{@code android:vmSafeMode}</dt> <dd>Indicates whether the app would like the virtual machine (VM) to operate in safe mode. The default value is {@code "false"}. -</dd> +<p> This attribute was added in API level 8 where a value of "true" +disabled the Dalvik just-in-time (JIT) compiler. </p> +<p> This attribute was adapted in API level 22 where a value of "true" +disabled the ART ahead-of-time (AOT) compiler. </p> +</dd> </dl></dd> diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index b040898..c1ccef0 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -143,12 +143,12 @@ features</a> tables, below. Descriptor string values are case-sensitive.</dd> the feature specified in <code>android:name</code>. <ul> -<li>When you declare <code>"android:required="true"</code> for a feature, +<li>When you declare <code>android:required="true"</code> for a feature, you are specifying that the application <em>cannot function, or is not designed to function</em>, when the specified feature is not present on the device. </li> -<li>When you declare <code>"android:required="false"</code> for a feature, it +<li>When you declare <code>android:required="false"</code> for a feature, it means that the application <em>prefers to use the feature</em> if present on the device, but that it <em>is designed to function without the specified feature</em>, if necessary. </li> @@ -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/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index e5e64e5..3ac87ef 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -227,11 +227,16 @@ Versions dashboards page</a>.</p> <table> <tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr> + <tr><td><a href="{@docRoot}about/versions/android-5.1.html">Android 5.1</a></td> + <td><a href="{@docRoot}sdk/api_diff/22/changes.html" title="Diff Report">22</a></td> + <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1}</td> + <td rowspan="2"><a href="{@docRoot}about/versions/lollipop.html">Platform +Highlights</a></td></tr> + <tr><td><a href="{@docRoot}about/versions/android-5.0.html">Android 5.0</a></td> <td><a href="{@docRoot}sdk/api_diff/21/changes.html" title="Diff Report">21</a></td> <td>{@link android.os.Build.VERSION_CODES#LOLLIPOP}</td> - <td><a href="{@docRoot}about/versions/lollipop.html">Platform -Highlights</a></td></tr> + </tr> <tr><td style="color:#bbb">Android 4.4W</td> <td><a href="{@docRoot}sdk/api_diff/20/changes.html" title="Diff Report">20</a></td> diff --git a/docs/html/guide/topics/ui/layout/grid.jd b/docs/html/guide/topics/ui/layout/grid.jd index c2f1321..3474f48 100644 --- a/docs/html/guide/topics/ui/layout/grid.jd +++ b/docs/html/guide/topics/ui/layout/grid.jd @@ -181,7 +181,7 @@ file.</p> <li>Run the application.</li> </ol> <p>You should see the following:</p> -<img src="images/hello-tablelayout.png" width="150px" /> +<img src="{@docRoot}guide/topics/ui/images/hello-tablelayout.png" width="150px" /> diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd index a4bf224..13467ae 100644 --- a/docs/html/guide/topics/ui/layout/gridview.jd +++ b/docs/html/guide/topics/ui/layout/gridview.jd @@ -70,8 +70,10 @@ public void onCreate(Bundle savedInstanceState) { gridview.setAdapter(new ImageAdapter(this)); gridview.setOnItemClickListener(new OnItemClickListener() { - public void onItemClick(AdapterView<?> parent, View v, int position, long id) { - Toast.makeText(HelloGridView.this, "" + position, Toast.LENGTH_SHORT).show(); + public void onItemClick(AdapterView<?> parent, View v, + int position, long id) { + Toast.makeText(HelloGridView.this, "" + position, + Toast.LENGTH_SHORT).show(); } }); } @@ -118,7 +120,8 @@ public class ImageAdapter extends BaseAdapter { // create a new ImageView for each item referenced by the Adapter public View getView(int position, View convertView, ViewGroup parent) { ImageView imageView; - if (convertView == null) { // if it's not recycled, initialize some attributes + if (convertView == null) { + // if it's not recycled, initialize some attributes imageView = new ImageView(mContext); imageView.setLayoutParams(new GridView.LayoutParams(85, 85)); imageView.setScaleType(ImageView.ScaleType.CENTER_CROP); 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 |