Doc: Update info on developing for Android devices

Task-number: QTCREATORBUG-26312
Change-Id: Ic95a7c6ea4b0ab092a1b1feb07bba3dd368a3584
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>

doc/qtcreator/src/android/androiddev.qdoc

@@ -36,7 +36,9 @@
 
     You can connect Android devices to the development PC using USB cables
     to build, run, debug, and analyze applications from \QC. Devices with
-    Android version 4.1 (API level 16) or later are supported.
+    Android version 4.1 (API level 16) or later are supported when developing
+    with Qt 5 and devices with Android version 6.0 (API level 23) when
+    developing with Qt 6.
 
     To develop for Android, you must have a tool chain for building applications
     for Android devices installed on the development PC. \QC can automatically
@@ -47,10 +49,6 @@
     Starting from Qt 5.14.0, the Qt for Android package contains all the
     architectures (ABIs) installed as one.
 
-    \note You can build a 64-bit version of Qt for Android yourself. However,
-    for such a Qt version, the minimum required Android version on devices
-    is 5.0 (API level 21). For more information, see \l{Qt for Android}.
-
     To enable helpful code editing features for Java, such as code completion,
     highlighting, function tooltips, and navigating in code, specify settings
     for a \l{Specifying Java Language Server Settings}{Java language server}.
@@ -83,7 +81,9 @@
 
     \list 1
         \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
-            \uicontrol Android.
+            \uicontrol Android on Windows and Linux or \uicontrol {\QC} >
+            \uicontrol Preferences > \uicontrol Devices > \uicontrol Android on
+            \macos.
             \image qtcreator-options-android-main.png "Android options"
         \li In the \uicontrol {JDK location} field, set the path to the JDK.
             \QC checks the JDK installation and reports errors.
@@ -108,7 +108,8 @@
             offers to add or remove those packages. Before taking action, it
             prompts you to accept the changes it is about to make. In addition,
             it prompts you to accept Google licenses, as necessary.
-        \li The installed NDK versions are listed below the SDK path.
+        \li The installed NDK versions are listed in
+            \uicontrol {Android NDK list}.
             The locked items were installed by the SDK Manager,
             and can only be modified from the \uicontrol {SDK Manager} tab.
             For more information, see \l{Managing Android NDK Packages}.
@@ -118,10 +119,9 @@
             For Qt applications that require OpenSSL support, \QC allows to
             quickly add the \l {Android OpenSSL support} to your project.
             For more information, see \l{Adding External Libraries}.
-        \li Select \inlineimage online.png
-            to download the OpenSSL repository to the selected path. If the
-            automatic download fails, the download web page opens for manual
-            download.
+        \li Select \uicontrol {Download OpenSSL} to download the OpenSSL
+            repository to the selected path. If the automatic download fails,
+            the download web page opens for manual download.
         \li Select the \uicontrol {Automatically create kits for Android tool chains}
             check box to allow \QC to create the kits for you. \QC displays a
             warning if it cannot find a suitable Qt version.
@@ -172,7 +172,9 @@
     \section2 Managing Android NDK Packages
 
     To view the installed \l{Android NDK} versions, select \uicontrol Tools >
-    \uicontrol Options > \uicontrol Devices > \uicontrol Android.
+    \uicontrol Options > \uicontrol Devices > \uicontrol Android on Windows and
+    Linux or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
+    \uicontrol Android on \macos.
 
     \image qtcreator-options-android-sdk-tools.png "Android NDK and SDK checks"
 
@@ -198,7 +200,9 @@
 
     To view the installed Android SDK packages, select \uicontrol Tools >
     \uicontrol Options > \uicontrol Devices > \uicontrol Android >
-    \uicontrol {SDK Manager}.
+    \uicontrol {SDK Manager} on Windows and Linux or \uicontrol {\QC} >
+    \uicontrol Preferences > \uicontrol Devices > \uicontrol Android >
+    \uicontrol {SDK Manager} on \macos.
 
     \image qtcreator-android-sdk-manager.png "Android SDK Manager"
 
@@ -216,15 +220,39 @@
 
     \section1 Managing Android Virtual Devices (AVD)
 
-    A list of AVDs is shown under \uicontrol Tools > \uicontrol Options >
-    \uicontrol Devices > \uicontrol Android > \uicontrol {AVD Manager}. This
-    works only if the \uicontrol {Android SDK location} is set correctly in
-    \uicontrol {Android Settings}.
+    The available AVDs are listed in \uicontrol Tools > \uicontrol Options
+    > \uicontrol Devices on Windows and Linux or \uicontrol {\QC} >
+    \uicontrol Preferences > \uicontrol Devices > on \macos. You can add more
+    AVDs.
 
-    The value in \uicontrol {System/data partition size} is used to set the
-    emulator's system partition size upon execution with \uicontrol {Start}.
+    \image qtcreator-android-avd-manager.png "Android device in Devices"
 
-    \image qtcreator-android-avd-manager.png "Android NDK and SDK checks"
+    You can see the status of the selected device in \uicontrol {Current state}.
+    To update the status information, select \uicontrol Refresh.
+
+    To start an AVD, select \uicontrol {Start AVD}. Usually, you don't need to
+    start AVDs separately because they are automatically started when you
+    select them in the \l{Building for Multiple Platforms}{kit selector} to
+    \l{Deploying Applications to Android Devices}{deploy applications} to them.
+
+    To remove an AVD from the list and the kit selector, select
+    \uicontrol {Erase AVD}.
+
+    To specify options for starting an AVD, select \uicontrol {AVD Arguments}.
+
+    \image qtcreator-android-avd-arguments.png "Startup options for AVDs"
+
+    Specify the options in \uicontrol {Emulator command-line startup options}.
+    For available options, see \l{Start the emulator from the command line}.
+
+    \note The Android Emulator has a bug that prevents it from starting on some
+    systems. If an AVD does not start, you can try starting it manually by
+    running the following commands:
+
+    \badcode
+    cd <ANDROID_SDK>/emulator
+    ./emulator -avd <AVD_NAME>
+    \endcode
 
     \section2 Creating a New AVD
 
@@ -232,68 +260,18 @@
 
     \list 1
         \li Select \uicontrol Tools > \uicontrol Options > \uicontrol Devices >
-            \uicontrol Android.
-        \li In the \uicontrol {SDK Manager} tab, select \uicontrol Install for
-            an Android version, and then select \uicontrol Apply to install a
-            system image. Alternatively, you can install the system image from
-            Android Studio.
-        \li In the \uicontrol {AVD Manager} tab, select \uicontrol {Add} to
-            open the \uicontrol {Create New AVD} dialog.
-            \image qtcreator-android-create-avd.png "Android NDK and SDK checks"
-        \li Set the name, type, skin, architecture, API level, and SD card size
-            of the device.
+            \uicontrol Add > \uicontrol {Android Device} on Windows and Linux
+            or \uicontrol {\QC} > \uicontrol Preferences > \uicontrol Devices >
+            \uicontrol Add > \uicontrol {Android Device} on \macos to open the
+            \uicontrol {Create New AVD} dialog.
+            \image qtcreator-android-create-avd.png "Create New AVD dialog"
+        \li Set the name, definition, architecture, target API level, and
+            SD card size of the device.
         \li Select \uicontrol OK to create the AVD.
     \endlist
 
     For more advanced options for creating a new AVD, use the command-line tool
-    \l{avdmanager}, or use Android Studio's native AVD Manager's UI.
-
-    \section1 Selecting Android Devices
-
-    When you deploy an application to an Android device with Android
-    version 4.2 (API 16) or later, the \uicontrol {Select Android Device} dialog
-    opens. It lists the devices that are connected to the development PC, as
-    well as AVDs, and their status. You can select devices or AVDs from the
-    \uicontrol {Compatible Devices} list for deployment.
-
-    If \QC determines that a device is not ready for deployment, it places the
-    device in the \uicontrol {Incompatible Devices} list, with information about the
-    issue. For example, you might need to authorize the connection on the
-    device. After you authorize the connection on the device, select
-    \uicontrol {Refresh Device List}. The device is moved to the
-    \uicontrol {Compatible Devices} list and you can select it for deployment.
-
-    Other reasons for showing a device in \uicontrol {Incompatible Devices} are
-    that the Android version on the device is too old or that the tool chain
-    used for building does not match the Android architecture on the device
-    (for example, you cannot deploy an ARM build on an x86 device).
-
-    \image qtcreator-android-select-devices.png "Select Android Devices dialog"
-
-    To \l{Creating a New AVD}{create a new AVD}, select \uicontrol {Create Android Virtual Device}.
-
-    To set a device as the default device for a particular Android architecture
-    for the current project, select the \uicontrol {Always use this device for architecture}
-    check box. The \uicontrol {Select Android Devices} dialog will not appear
-    until you switch to another project or restart \QC.
-
-    \section1 Using the Android Emulator
-
-    To run your application on the Android Emulator, you must have an Android
-    virtual device (AVD). For more information about creating a new one, see
-    \l{Creating a New AVD}. If you run an application without a device connected to the
-    development PC and without an AVD specified, \QC asks you to add an AVD.
-
-    \note The Android Emulator has a bug that prevents it from starting on some
-    systems. If the Android Emulator does not start, you can try starting it
-    manually by running the following commands:
-
-    \badcode
-    cd <ANDROID_SDK>/emulator
-    ./emulator -avd <AVD_NAME>
-    \endcode
-
-    For more information, see \l{Start the emulator from the command line}.
+    \l{avdmanager} or the Android Studio's native AVD Manager UI.
 
     \section1 Debugging on Android Devices
 

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

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -34,19 +34,19 @@
 
     A default set of Android Activity manager (am) start options is applied when
     starting applications. You can specify additional start options in the
-    \uicontrol {Activity manager start options} field. However, if the default
+    \uicontrol {Activity manager start arguments} field. However, if the default
     options conflict with the added options, the application might not start.
 
     The default arguments for the Activity manager for a normal run:
 
     \badcode
-    am start -n org.qtproject.example.notification/org.qtproject.qt5.android.bindings.QtActivity
+    am start -n <package_name>/<QtActivity_name>
     \endcode
 
     The default arguments for the Activity manager for the debugger mode:
 
     \badcode
-    am start -n org.qtproject.example.notification/org.qtproject.qt5.android.bindings.QtActivity -D
+    am start -n <package_name>/<QtActivity_name> -D
     \endcode
 
     For example, to run the application as a particular user, enter the start
@@ -54,18 +54,20 @@
 
     \image qtcreator-android-run-settings.png
 
-    You can specify shell commands to run before the application is started and
-    after it is quit. For example, enter the following commands to unlock the
-    screen and to switch to the user account \c 10 on the device before running
-    the application:
+    You can specify shell commands to run before the application is started
+    and after it is quit. For example, enter the following commands into
+    \uicontrol{Pre-launch on-device shell commands} to unlock the screen and
+    to switch to the user account \c 10 on the device before running the
+    application:
 
     \code
     input keyevent 82
     am switch-user 10
     \endcode
 
-    Enter the following commands to switch back to the default user, \c 0, and
-    to unlock the screen after the application is quit:
+    Enter the following commands into
+    \uicontrol{Post-quit on-device shell commands} to switch back to the
+    default user, \c 0, and to unlock the screen after the application is quit:
 
     \code
     am switch-user 0

doc/qtcreator/src/android/deploying-android.qdoc

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -52,7 +52,8 @@
 
     \note Since \QC 4.12, Ministro is not supported.
 
-    To specify settings for application packages, select \uicontrol Projects >
+    To \l{Specifying Settings for Packages}{specify settings} for application
+    packages, select \uicontrol Projects > \uicontrol Build >
     \uicontrol {Build Android APK} > \uicontrol Details.
 
     \if defined(qtcreator)
@@ -64,7 +65,7 @@
 
     Because bundling applications as APK packages is not
     trivial, Qt 5 provides a deployment tool called \c androiddeployqt.
-    When you deploy an application using a \uicontrol {Qt for Android Kit}, \QC uses
+    When you deploy an application using a \e {Qt for Android kit}, \QC uses
     the \c androiddeployqt tool to create the necessary files and to bundle them
     into an APK:
 
@@ -100,41 +101,58 @@
     To view the packages that the \c androiddeployqt tool created, select the
     \uicontrol {Open package location after build} check box.
 
-    The packages are deployed on the connected Android devices. To switch the
-    device used as a default device for the selected kit, select
-    \uicontrol Projects > \uicontrol Run > \uicontrol {Deploy to Android Device}
-    > \uicontrol {Reset Default Devices}. The setting applies until you restart \QC.
-    For more information, see \l{Selecting Android Devices}.
+    \section2 Specifying Deployment Settings
 
-    For more information about the \c androiddeployqt tool, see
-    \l{Deploying an Application on Android}.
+    The available deployment settings are listed in the \uicontrol Method field.
+    To add deployment methods for a project, select \uicontrol Add.
+
+    \image qtcreator-android-deployment-settings.png "Deployment settings"
+
+    To rename the current deployment method, select \uicontrol Rename.
+
+    To remove the current deployment method, select \uicontrol Remove.
+
+    The packages are deployed on the Android device that you select in the
+    \l{Building for Multiple Platforms}{kit selector}. To add devices, select
+    \uicontrol Manage.
+
+    For more information about specifying additional start options for
+    applications, see \l{Specifying Run Settings for Android Devices}.
+
+    To remove previously installed files from the device, select
+    \uicontrol {Uninstall the existing app before deployment}.
+
+    To install a pre-built APK, such as a 3rd-party application to a device,
+    select \uicontrol {Install an APK File}.
 
     \section2 Specifying Settings for Packages
 
-    You can specify settings for the \c androiddeployqt tool in \QC and in the
-    project .pro file. To specify settings in \QC, select \uicontrol Projects >
-    \uicontrol Build > \uicontrol {Build Android APK} > \uicontrol Details.
+    To specify settings for the \c androiddeployqt tool, select
+    \uicontrol Projects > \uicontrol Build > \uicontrol {Build Android APK} >
+    \uicontrol Details.
 
-    \image qtcreator-android-deploy-configurations.png "Deploy configurations"
+    \image qtcreator-android-build-apk-step.png "Build Android APK step"
 
-    The anddroiddeployqt tool uses the information in the project .pro file to
-    create APKs. For more information about the qmake variables
-    that you can set in the .pro file to tailor the APK, see
-    \l{Deploying an Application on Android}.
+    The \c androiddeployqt tool uses the configuration information to
+    create APKs. For more information about the available options, see
+    \l{androiddeployqt}.
 
-    You can view information about what the anddroiddeployqt tool is doing in
+    You can view information about what the \c androiddeployqt tool is doing in
     the \uicontrol {Compile Output} pane. To view additional information, select the
     \uicontrol {Verbose output} check box.
 
+    Select \uicontrol {Add debug server} to include the debug server binary
+    into a package.
+
     \section3 Selecting API Level
 
-    In the \uicontrol {Android build SDK} field, you can select the API level to use
-    for building the application. Usually, you should select the newest API
-    level available.
+    In the \uicontrol {Android build platform SDK} field, you can select the
+    API level to use for building the application. Usually, you should select
+    the highest API level available.
 
-    \note For Qt 5.12.0 to 5.12.5 and Qt 5.13.0 to 5.13.1, Android build SDK 28 should
-    be used. For recent versions than the latter, build SDK 29, or the most recent
-    should be used.
+    \note For Qt 5.12.0 to 5.12.5 and Qt 5.13.0 to 5.13.1, Android build
+    platform SDK 28 should be used. For more recent versions than Qt 5.13.1,
+    build platform SDK 29 or the most recent one should be used.
 
     This field does not specify the minimum supported API level nor the target
     API level, which you can specify in the Android manifest. See
@@ -146,7 +164,7 @@
     For testing the application locally, use the APK format, because
     the package can be uploaded directly to the device and run. For
     distribution to the Google Play store, create an AAB by selecting
-    the \uicontrol {Build .aab (Android App Bundle)} check box.
+    the \uicontrol {Build Android App Bundle (*.aab)} check box.
 
     When building with CMake, you can view the selected ABIs in the
     \uicontrol {Initial CMake parameters} field in the \uicontrol CMake section.
@@ -253,11 +271,11 @@
 
     \section1 Editing Manifest Files
 
-    You can use the qmake variables to specify all
-    the settings you need for the \c androiddeployqt tool and you do not need an
-    Android manifest file unless you need to specify Android specific settings
-    like the application's icon. Also, the manifest file is needed if you want
-    to publish the package in the Play Store.
+    You can use the configuration options to specify all the settings you need
+    for the \c androiddeployqt tool. You only need an Adroid manifest file
+    to specify Android-specific settings, such as the application icon.
+    However, the manifest file is needed when you want to publish the package
+    in the Play Store.
 
     \section2 Package Names
 
@@ -384,7 +402,7 @@
             \li Locks the orientation to its current rotation, whatever that is.
     \endtable
 
-    \section2 Supported Resolutions
+    \section2 Icons and Splash Screens
 
     You can set different images to be shown as application icons and splash
     screens on low, medium, high, and extra high DPI displays. The following
@@ -399,6 +417,36 @@
         \li Extra-extra-extra-high-density (XXXHDPI): ~640dpi
     \endlist
 
+    Specify settings for icons in the \uicontrol {Application icon} tab. Select
+    the image with the highest resolution as the \uicontrol {Master icon}.
+    \QC resizes the icon and sets versions of it to be shown on low, medium,
+    high, and extra high DPI displays, as needed. Alternatively, set the icons
+    for each resolution separately.
+
+    \image qtcreator-android-manifest-editor-app-icon.png "Application icons in Android Manifest Editor"
+
+    Specify settings for splash screens in the \uicontrol {Splash screen} tab.
+    Select images to display as splash screens depending on the device
+    orientation and screen resolution.
+
+    \image qtcreator-android-manifest-editor-splash-screen.png "Splash screens in Android Manifest Editor"
+
+    By default, the splash screen is hidden automatically
+    when an activity is drawn. To keep it visible until
+    \l{QNativeInterface::QAndroidApplication::hideSplashScreen()} is
+    called, select the \uicontrol {Sticky splash screen} check box.
+
+    In \uicontrol {Image show mode}, select whether to center the splash screen
+    on the device display or scale it to fill the display.
+
+    Set a background color in \uicontrol {Background color}.
+
+    Select the images with the highest resolution as the
+    \uicontrol {Master image}, \uicontrol {Portrait master image},
+    and \uicontrol {Landscape master image}.
+
+    Select \uicontrol {Clear All} to reset all settings or remove all images.
+
     \section2 Android Manifest Editor
 
     If you use qmake as the build system, you can create an Android manifest
@@ -447,22 +495,11 @@
     \li In the \uicontrol {Screen orientation} field, select the option for
         determining \l{Screen Orientation}{screen orientation}.
 
-    \li In \uicontrol {Application icon}, select an image with the highest
-        \l{Supported Resolutions}{resolution} as the \uicontrol {Master icon}.
-        \QC resizes the icon and sets versions of it to be shown on low,
-        medium, high, and extra high DPI displays, as needed. Alternatively,
-        set the icons for each resolution separately.
-
-        \image qtcreator-android-manifest-editor-app-icon.png "Application icons in Android Manifest Editor"
+    \li In \uicontrol {Application icon}, specify images to use as application
+        icons depending on screen resolution.
 
     \li In \uicontrol {Splash screen}, select images to display as splash
-    screens depending on the device orientation. You can set different images
-    to be shown on low, medium, high, and extra high DPI displays. By default,
-    the splash screen is hidden automatically when an activity is drawn. To keep
-    it visible until \l{QtAndroid::hideSplashScreen()} is called, select the
-    \uicontrol {Sticky splash screen} check box.
-
-    \image qtcreator-android-manifest-editor-splash-screen.png "Splash screens in Android Manifest Editor"
+        screens depending on the screen orientation and resolution.
 
     \li In \uicontrol {Android services}, select \uicontrol Add to add a service.
     You must enter at least a service class name for a new service. If you select

doc/qtcreator/src/overview/creator-only/creator-mobile-targets.qdoc

@@ -56,11 +56,11 @@
             Qt applications for Android are compiled as \c {shared objects} that
             are loaded by a Java launcher that is part of Qt.
             This is totally transparent to users. As Qt is composed of libraries
-            referencing each other, Qt 4 applications are only supported on
-            Android version 1.6, or later, and Qt 5 applications on version
-            4.1 (API level 16), or later. You must install a Qt version
-            targeting Android and the Android SDK and NDK to develop for
-            Android devices.
+            referencing each other, Qt 5 applications are only supported on
+            Android version 4.1 (API level 16), or later, and Qt 6 applications
+            on Android version 6.0 (API level 23), or later. You must install a
+            Qt version targeting Android and the Android SDK and NDK to develop
+            for Android devices.
 
         \if defined(qtcreator)
         \li \l{Connecting Bare Metal Devices}

doc/qtcreator/src/projects/creator-only/creator-projects-building.qdoc

@@ -55,7 +55,8 @@
 
         \li  Click the \uicontrol {Build and Run Kit Selector} icon (1) or select
              \uicontrol Build > \uicontrol {Open Build and Run Kit Selector} to select the
-             build and run \l{glossary-buildandrun-kit}{kit}.
+             build and run \l{glossary-buildandrun-kit}{kit} or an
+             \l{Managing Android Virtual Devices (AVD)}{Android device}.
 
         \image qtcreator-kit-selector.png "Kit selector"