From 6398d79760718e4fc5fe6373b786fd35de31be6b Mon Sep 17 00:00:00 2001 From: charitha Date: Wed, 29 Mar 2017 23:15:59 +0530 Subject: [PATCH] Fix https://github.com/wso2/product-iots/issues/332 (cherry picked from commit 0e4df87) --- .../private/config.json | 2 +- .../type-view.hbs | 88 +++++++++++-------- 2 files changed, 51 insertions(+), 39 deletions(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json index d63751c8f8..1404907b32 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json @@ -1,7 +1,7 @@ { "deviceType": { "label": "Android", - "virtualLabel": "Android Emulator", + "virtualLabel": "virtual Android", "category": "hybrid", "analyticsEnabled": "false", "groupingEnabled": "false", diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs index 5bdd406355..7e9011bf29 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs @@ -5,7 +5,7 @@
{{#if isVirtual}} -

DOWNLOAD ANDROID TRY-IT EMULATOR

+

DOWNLOAD THE VIRTUAL ANDROID DEVICE

{{else}}

DOWNLOAD THE ANDROID AGENT

{{/if}} @@ -19,11 +19,11 @@
-->
{{#if isVirtual}} -

Experience Android Device Management Agent with our Try-it Emulator

+

Download our Android-try-it emulator, enroll it with WSO2 Device Cloud and try it out!

- Download Try-it Emulator
+ Download the android-try-it Emulator
{{else}}

Scan to get the Android Agent.

@@ -52,8 +52,13 @@ target="_blank">link.

--> {{#if isCloud}}

Need help? Read WSO2 Device - Cloud documentation.

+ {{#if isVirtual}} + href="https://docs.wso2.com/display/DeviceCloud/Quick+Start+Guide" + {{else}} + href="https://docs.wso2.com/display/DeviceCloud/Enrolling+an+Android+Device" + {{/if}} + target="_blank">WSO2 Device Cloud documentation. +

{{else}}

Need help? Read WSO2 @@ -64,7 +69,7 @@

{{#if isVirtual}} -

TRY ANDROID AGENT WITH TRY-IT EMULATOR

+

TRY OUT THE VIRTUAL ANDROID DEVICE

{{else}}

START ENROLLING YOUR DEVICE

{{/if}} @@ -74,38 +79,45 @@ {{#if isCloud}}
-
+ {{#if isVirtual}} +
Step 1
- {{#if isVirtual}} -
-
    -
  1. Unzip the 'android-tryit.zip file and run the 'start' script on your terminal.
    2. -
  2. Download and install the Android SDK. -
      -
    • If you already have an Android SDK on your computer, please provide the location of the SDK.
      • -
    • Else, this tool will download and install the minimum SDK components required to run the emulator. - This is a one-time process.
      • -
    -
    3. -
  3. Next, you will be asked to create an AVD: -
      -
    • If you don't have one, the WSO2_AVD will be created for you.
      • -
    • Else, you can use an existing AVD to try out IoT Android agent.
      • -
    -
    4. -
-
- - {{else}} -
-

Let's start by opening the Android agent on your device. -
Tap on WSO2 Device Management Agent. -

-
- - {{/if}} +
+
    +
  1. Unzip the 'android-tryit.zip file and run the 'start' script on your terminal.
    2. +
  2. Download and install the Android SDK. +
      +
    • If you already have an Android SDK on your computer, please provide the location of + the SDK. +
      • +
    • Else, this tool will download and install the minimum SDK components required to run + the emulator. + This is a one-time process. +
      • +
    +
    3. +
  3. Next, you will be asked to create an AVD: +
      +
    • If you don't have one, the WSO2_AVD will be created for you.
      • +
    • Else, you can use an existing AVD to try out IoT Android agent.
      • +
    +
    4. +
+
+
+ {{else}}
+
Step 1
+
+

Let's start by opening the Android agent on your device. +
Tap on WSO2 Device Management Agent. +

+
+ +
+ {{/if}} +
Step 2

Enter your: @@ -113,12 +125,12 @@

  • Organization: {{@user.domain}}
  • Username: {{@user.username}}
    • -
  • Password: The WSO2 Cloud password.
    • +
  • Password: Your Cloud password.
-
+
Step 3

To successfully register the virtual device,

@@ -174,7 +186,7 @@
  • Organization: {{@user.domain}}
  • Username: {{@user.username}}
    • -
  • Password: The WSO2 Cloud password.
    • +
  • Password: Your password.