Doc: Android Manifest editor

Move text around as some features moved from run settings
to the Android Manifest editor.

Update screen shots.

Change-Id: Idddde8490d382c5bf5de0131b8b53ceea2f738ee
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

doc/src/android/creator-projects-settings-run-android.qdocinc

@@ -1,14 +1,13 @@
-    To specify information for the Android manifest file, select \gui Projects >
+    To configure Android packages, select \gui Projects >
     \gui Run > \gui {Package configurations}. The Android system uses the
     information from the file to start application components.
 
-    \section2 Specifying Package Data
+    \image qtcreator-android-manifest.png "Package configuration"
 
-    In the \gui Manifest tab, you can select the API level to use for the
+    \section2 Selecting API Level
-    Android target SDK and the name and version number for the application
-    package.
 
-    \image qtcreator-android-manifest.png "Manifest tab"
+    In the \gui {Android target SDK} field, you can select the API level to use
+    for the Android target SDK.
 
     For more information about Android API levels, see
     \l{http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels}
@@ -21,43 +20,15 @@
     \note The android-4 API level does not support multitouch. If your
     application needs multitouch, select a higher API level.
 
-    In the \gui {Package name} field, enter a package name for the application.
-    The application is launched by an automatically generated Java launcher that
-    is packaged with the application into an Android package (.apk). For more
-    information, see
-    \l{http://developer.android.com/guide/components/fundamentals.html}
-    {Android Application Fundamentals}.
-
-    \section2 Specifying Application Data
-
-    In the \gui Application tab, you can select an icon for the application and
-    give the application a name.
-
-    \image qtcreator-android-application.png "Application tab"
-
-    \section2 Setting Permissions
-
-    In the \gui Permissions tab, you can specify the permissions that your
-    application needs. Users are asked to grant the permissions when they
-    install the application. Android OS then grants the application access to
-    the appropriate data and features.
-
-    \image qtcreator-android-permissions.png "Permissions tab"
-
-    Select from existing Android permissions or add new ones to deploy the
-    application to a particular Android OS.
-
     \section2 Selecting Qt Libraries
 
-    In the \gui Libraries tab, specify which Qt libraries the application uses.
+    In the \gui Libraries group, specify which Qt libraries the application uses.
     To automatically determine this, select \gui {Read Infomation from
     Application (Must Be Compiled)}. Alternatively, you can manually select the
     Qt libraries and the external libraries you think your application needs.
     Make sure to arrange the libraries so that depended libraries appear before
     the ones that depend on them.
 
-    \image qtcreator-android-libraries.png "Libraries tab"
-
     These entries are used by the Ministro tool to determine which Qt libraries
     to download.
 
@@ -66,8 +37,38 @@
 
     \section2 Signing Android Packages
 
-    In the \gui {Sign Package} tab, you can sign the Android package by using
+    In the \gui {Sign Package} group you can sign the Android package by using
     a private key from the keystore. To create new keys, select \gui Create.
 
-    \image qtcreator-android-sign-package.png "Sign Package tab"
+    \image qtcreator-android-sign-package.png "Sign Package"
 
+    \section1 Editing Manifest Files
+
+    To specify information for the Android manifest file, open it in \QC.
+
+    \image qtcreator-android-manifest-editor.png "Android Manifest Editor"
+
+    Select the \gui {XML Source} tab to edit the file in XML format.
+
+    In the \gui {Package name} field, enter a package name for the application.
+    The application is launched by an automatically generated Java launcher that
+    is packaged with the application into an Android package (.apk). For more
+    information, see
+    \l{http://developer.android.com/guide/components/fundamentals.html}
+    {Android Application Fundamentals}.
+
+    You can specify an internal version number for the package in the
+    \gui {Version code} field. It is used to determine whether one version of
+    the application is more recent than another. In the \gui {Version name}
+    field, specify the version number that is shown to users.
+
+    In the \gui Application group, you can give the application a name and
+    select an icon for it. The three icon fields can contain different versions
+    of the icon with low, medium, and high DPI values, from left to right.
+
+    In the \gui Permissions field, you can specify the permissions that your
+    application needs. Users are asked to grant the permissions when they
+    install the application. Android OS then grants the application access to
+    the appropriate data and features.
+
+    To add permissions, select \gui Add and select permissions from the list.