diff --git a/docs/html/training/basics/firstapp/creating-project.jd b/docs/html/training/basics/firstapp/creating-project.jd index 71b93c0c39056..79268a00eba33 100644 --- a/docs/html/training/basics/firstapp/creating-project.jd +++ b/docs/html/training/basics/firstapp/creating-project.jd @@ -103,10 +103,13 @@ lesson.

Activities for more information.

-
  • Under Add an activity to your project, select Blank Activity - and click Next.
    • -
  • Under Describe the new activity for your project, leave the fields as they - are and click Finish.
    • +
  • Under Add an activity to <template>, select Blank + Activity and click Next.
    • +
  • Under Choose options for your new file, change the + Activity Name to MyActivity. The Layout Name changes + to activity_my, and the Title to MyActivity. The + Menu Resource Name is menu_my. +
  • Click the Finish button to create the project.

    • Your Android project is now a basic "Hello World" app that contains some default files. Take a @@ -123,7 +126,7 @@ moment to review the most important of these:

    select the file you see the class definition for the activity you created. When you build and run the app, the {@link android.app.Activity} class starts the activity and loads the layout file that says "Hello World!" -
    app/src/res/AndroidManifest.xml
    +
    app/src/main/AndroidManifest.xml
    The manifest file describes the fundamental characteristics of the app and defines each of its components. You'll revisit this file as you follow these lessons and add more components to your app.
    @@ -159,13 +162,16 @@ moment to review the most important of these:

    Note also the /res subdirectories that contain the resources for your application:

    -
    drawable-hdpi/
    -
    Directory for drawable objects (such as bitmaps) that are designed for high-density - (hdpi) screens. Other drawable directories contain assets designed for other screen densities. +
    drawable<density>/
    +
    Directories for drawable objects (such as bitmaps) that are designed for various densities, + such as medium-density (mdpi) and high-density (hdpi) screens. Other drawable directories + contain assets designed for other screen densities. Here you'll find the ic_launcher.png that appears when you run the default app.
    layout/
    Directory for files that define your app's user interface like activity_my.xml, discussed above, which describes a basic layout for the MyActivity class.
    +
    menu/
    +
    Directory for files that define your app's menu items.
    values/
    Directory for other XML files that contain a collection of resources, such as string and color definitions. The strings.xml file defines the "Hello world!" string that @@ -180,9 +186,9 @@ moment to review the most important of these:

    using the SDK tools from a command line:

      -
    1. Change directories into the Android SDK’s tools/ path.
      2. +
    2. Change directories into the Android SDK’s sdk/ path.
    3. Execute: -
      android list targets
      +
      tools/android list targets

      This prints a list of the available Android platforms that you’ve downloaded for your SDK. Find the platform against which you want to compile your app. Make a note of the target ID. We recommend that you select the highest version possible. You can still build your app to @@ -212,4 +218,3 @@ To run the app, continue to the next lesson.

      - diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd index c09669fc5840d..fdf0d1f59a534 100644 --- a/docs/html/training/basics/firstapp/running-app.jd +++ b/docs/html/training/basics/firstapp/running-app.jd @@ -83,14 +83,37 @@ from the toolbar.

      4. Run the app from a command line

      -
        -
      1. Change directories to the root of your Android project and execute: -
        ant debug
        2. -
      2. Make sure the Android SDK platform-tools/ directory is included in your -PATH environment variable, then execute: -
        adb install bin/MyFirstApp-debug.apk
        3. -
      3. On your device, locate MyFirstApp and open it.
        4. -
      +

      Open a command-line and navigate to the root of your project directory. + Use Gradle to build your project in debug mode, invoke the assembleDebug build task + using the Gradle wrapper script (gradlew assembleRelease). + +

      This creates your debug .apk file inside the module build/ + directory, named MyFirstApp-debug.apk.

      + +

      On Windows platforms, type this command:

      + +
      +> gradlew.bat assembleDebug
+
      + +

      On Mac OS and Linux platforms, type these commands:

      + +
      +$ chmod +x gradlew
+$ ./gradlew assembleDebug
+
      + +

      After you build the project, the output APK for the app module is located in + app/build/outputs/apk/ + +

      Note: The first command (chmod) adds the execution + permission to the Gradle wrapper script and is only necessary the first time you build this + project from the command line.

      + +

      Make sure the Android SDK platform-tools/ directory is included in your + PATH environment variable, then execute: + 

      adb install app/build/outputs/MyFirstApp-debug.apk

      +

      On your device, locate MyFirstApp and open it.

      That's how you build and run your Android app on a device! To start developing, continue to the next @@ -114,12 +137,29 @@ device.

      1. Launch the Android Virtual Device Manager:
          -
        • In the Android Studio tool bar, click the Android Virtual Device Manager icon - .
          • -
        • From the command line, change directories to <sdk>/tools/ and execute: - 
          android avd
          • +
        • In Android Studio, select Tools > Android > AVD Manager, or click + the AVD Manager icon in the toolbar.
          • +
        • Or, from the command line, change directories to + sdk/ and execute: + 
          tools/android avd
          +

          Note: The AVD Manager that appears + when launched from the command line is different from the version in + Android Studio, so the following instructions may not all apply.

          +
        + + +

        Figure 1. The AVD Manager main screen shows your current virtual devices.

        + +
        2. +
      2. On the AVD Manager main screen (figure 1), click Create Virtual Device.
        3. +
      3. In the Select Hardware window, select a device configuration, such as Nexus 6, + then click Next. +
        4. +
      4. Select the desired system version for the AVD and click Next. +
        5. +
      5. Verify the configuration settings, then click Finish.
      6. In the Android Virtual Device Manager window, click Create.
      7. Enter an AVD Name.
        8. @@ -137,40 +177,33 @@ device.

        Run the app from Android Studio

        1. In Android Studio, select your project and click Run - - from the toolbar.
          2. + from the toolbar.
        2. In the Choose Device window, click the Launch emulator radio button.
        3. From the Android virtual device pull-down menu, select the emulator you created, and click OK.

        It can take a few minutes for the emulator to load itself. You may have to unlock the screen. - When you do, My First App appears on the emulator screen.

        +When you do, My First App appears on the emulator screen.

        Run your app from the command line

        - -
          -
        1. Change directories to the root of your Android project and execute: - 
          ant debug
          2. +
            +
          1. Build the project from the command line. The output APK for the app module is located in + app/build/outputs/apk/.
          2. Make sure the Android SDK platform-tools/ directory is included in your - PATH environment variable, then execute: - 
            adb install bin/MyFirstApp-debug.apk
            3. + PATH environment variable. +
          3. Execute this command: +

            + 

            adb install app/build/outputs/MyFirstApp-debug.apk
            +

            +
          4. On the emulator, locate MyFirstApp and open it.
            5. -
          +
        -

        That's how you build and run your Android app on the emulator! +

        That's how you build and run your Android app on the emulator! To start developing, continue to the next -lesson.

        - - - - - - - - - + lesson.