diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/__DEPRECATED__DO_NOT_EDIT__.txt | 16 | ||||
| -rw-r--r-- | docs/html/__DEPRECATED__DO_NOT_EDIT__.txt | 16 | ||||
| -rwxr-xr-x | docs/html/guide/topics/manifest/uses-feature-element.jd | 29 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/providing-resources.jd | 23 |
4 files changed, 51 insertions, 33 deletions
diff --git a/docs/__DEPRECATED__DO_NOT_EDIT__.txt b/docs/__DEPRECATED__DO_NOT_EDIT__.txt new file mode 100644 index 000000000000..3f8fc80c3b0b --- /dev/null +++ b/docs/__DEPRECATED__DO_NOT_EDIT__.txt @@ -0,0 +1,16 @@ +### DEPRECATED: DO NOT EDIT ### + +The source files for developer.android.com are NO LONGER MAINTAINED HERE, as +of 12/2016. Migration of content was completed on 10/16/2016. + +All authoring of content has been moved to Piper (go/dac-source). + +Exceptions and Caveats: + +- Reference documentation is still maintained via building of .java source files, + so you may continue to update JavaDoc comments to update documentation. + +- Sample code documentation is not maintained in Piper, but is published from + a separate code repository. + +For answers to further questions, please email: android-writers@google.com diff --git a/docs/html/__DEPRECATED__DO_NOT_EDIT__.txt b/docs/html/__DEPRECATED__DO_NOT_EDIT__.txt new file mode 100644 index 000000000000..3f8fc80c3b0b --- /dev/null +++ b/docs/html/__DEPRECATED__DO_NOT_EDIT__.txt @@ -0,0 +1,16 @@ +### DEPRECATED: DO NOT EDIT ### + +The source files for developer.android.com are NO LONGER MAINTAINED HERE, as +of 12/2016. Migration of content was completed on 10/16/2016. + +All authoring of content has been moved to Piper (go/dac-source). + +Exceptions and Caveats: + +- Reference documentation is still maintained via building of .java source files, + so you may continue to update JavaDoc comments to update documentation. + +- Sample code documentation is not maintained in Piper, but is published from + a separate code repository. + +For answers to further questions, please email: android-writers@google.com diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index 7db05035bd8c..843fe1c863f9 100755 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -1231,7 +1231,7 @@ densities: '160' </p> <p> - When declared as required, this feature indicates that the app is + By default, your app requires this feature. This feature indicates that the app is compatible with a device only if that device emulates a touchscreen ("fake touch" interface) or has an actual touchscreen. </p> @@ -1241,19 +1241,12 @@ densities: '160' that emulates a subset of a touchscreen's capabilities. For example, a mouse or remote control could drive an on-screen cursor. If your app requires basic point and click interaction (in other words, it won't work - with only a d-pad controller), you should declare this feature. Because + with only a d-pad controller), you should declare this feature or simply + avoid declaring any {@code android.hardware.touchscreen.*} features. Because this is the minimum level of touch interaction, you can also use an app that declares this feature on devices that offer more complex touch interfaces. </p> - - <p class="note"> - <strong>Note:</strong> Apps require the {@code android.hardware.touchscreen} - feature by default. If you want your app to be available to devices that - provide a fake touch interface, you must also explicitly declare that a - touchscreen is not required as follows: - </p> - <pre><uses-feature android:name="android.hardware.touchscreen" <strong>android:required="false"</strong> /></pre> </dd> <dt> @@ -1328,21 +1321,9 @@ densities: '160' </p> <p> - By default, your app requires this feature. As such, your app is not - available to devices that provide only an emulated touch interface ("fake - touch") by default. If you want to make your app available on devices - that provide a fake touch interface (or even on devices that provide only - a d-pad controller), you must explicitly declare that a touchscreen is - not required by declaring {@code android.hardware.touchscreen} with - {@code android:required="false"}. You should add this declaration if your - app uses—but does not require—a real touchscreen interface. - </p> - - <p> If your app in fact requires a touch interface (to perform more advanced - touch gestures such as fling), then you don't need to declare any touch - interface features because they're required by default. However, it's - best if you explicitly declare all features that your app uses. + touch gestures such as fling), then you must explicitly declare this feature + or any advanced touchscreen features. </p> <p> diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index 80a989a57e28..99aeb4379eeb 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -905,20 +905,25 @@ PNG file and two small XML files that point to it. (An example XML file is shown <h4>Drawable</h4> -<p>To create an alias to an existing drawable, use the {@code <bitmap>} element. -For example:</p> +<p> + To create an alias to an existing drawable, use the {@code <drawable>} + element. For example: +</p> <pre> <?xml version="1.0" encoding="utf-8"?> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/icon_ca" /> +<resources> + <drawable name="icon">@drawable/icon_ca</drawable> +</resources> </pre> -<p>If you save this file as {@code icon.xml} (in an alternative resource directory, such as -{@code res/drawable-en-rCA/}), it is compiled into a resource that you -can reference as {@code R.drawable.icon}, but is actually an alias for the {@code -R.drawable.icon_ca} resource (which is saved in {@code res/drawable/}).</p> - +<p> + If you save this file as {@code drawables.xml} (in an alternative resource + directory, such as {@code res/values-en-rCA/}), it is compiled into a + resource that you can reference as {@code R.drawable.icon}, but is actually + an alias for the {@code R.drawable.icon_ca} resource (which is saved in + {@code res/drawable/}). +</p> <h4>Layout</h4> |