mypipe &
-while IFS= read -r line
-do
- if [ $line = "package:$pkg" ]; then
- let hasAgent=true
- fi
-done < mypipe
-rm mypipe
-
-if [ $hasAgent = false ]; then
- echo
- echo "Installing agent..."
- cd $SCRIPT_HOME/resources
- $ANDROID_TRYIT_SDK_HOME/platform-tools/adb install android-agent.apk
-fi
-
-echo
-echo "Staring agent..."
-$ANDROID_TRYIT_SDK_HOME/platform-tools/adb shell am start -n $pkg/$act
-echo
-echo "Connected to device shell"
-$ANDROID_TRYIT_SDK_HOME/platform-tools/adb shell
-echo
-echo "Good bye!"
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/startEmulator.bat b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/startEmulator.bat
new file mode 100755
index 000000000..aedb7fb05
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/startEmulator.bat
@@ -0,0 +1,17 @@
+@echo off
+echo Welcome
+
+java^
+ -Dsdk.tools.url="https://dl.google.com/android/repository/tools_r25.2.5-windows.zip"^
+ -Dplatform.tools.url="http://dl.google.com/android/repository/platform-tools_r25.0.3-windows.zip"^
+ -Dbuild.tools.url="https://dl.google.com/android/repository/build-tools_r25.0.2-windows.zip"^
+ -Dplatform.url="https://dl.google.com/android/repository/platform-23_r03.zip"^
+ -Dsys.img.url="https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip"^
+ -Dhaxm.url="https://dl.google.com/android/repository/extras/intel/haxm-windows_r6_0_5.zip"^
+ -Ddownloaded.build.tool.name="android-7.1.1"^
+ -Dbuild.tool.version="25.0.2"^
+ -Ddownloaded.platform.name="android-6.0"^
+ -Dtarget.version="android-23"^
+ -Dos.target="x86"^
+ -jar JavaApp.jar
+
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/startEmulator.sh b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/startEmulator.sh
new file mode 100755
index 000000000..22b392208
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/android-tryit/startEmulator.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+echo Welcome
+
+OS_SUFFIX="linux"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+ OS_SUFFIX="macosx"
+fi
+
+java\
+ -Dsdk.tools.url="https://dl.google.com/android/repository/tools_r25.2.5-$OS_SUFFIX.zip"\
+ -Dplatform.tools.url="http://dl.google.com/android/repository/platform-tools_r25.0.3-$OS_SUFFIX.zip"\
+ -Dbuild.tools.url="https://dl.google.com/android/repository/build-tools_r25.0.2-$OS_SUFFIX.zip"\
+ -Dplatform.url="https://dl.google.com/android/repository/platform-23_r03.zip"\
+ -Dsys.img.url="https://dl.google.com/android/repository/sys-img/android/x86-23_r09.zip"\
+ -Dhaxm.url="https://dl.google.com/android/repository/extras/intel/haxm-macosx_r6_0_5.zip"\
+ -Ddownloaded.build.tool.name="android-7.1.1"\
+ -Dbuild.tool.version="25.0.2"\
+ -Ddownloaded.platform.name="android-6.0"\
+ -Dtarget.version="android-23"\
+ -Dos.target="x86"\
+ -jar JavaApp.jar
+
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.device-view/device-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.device-view/device-view.hbs
index 09121c01f..a9cb25acb 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.device-view/device-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.device-view/device-view.hbs
@@ -50,25 +50,27 @@
{{/zone}}
{{#zone "device-details"}}
- {{#if device.deviceInfoAvailable}}
- {{#if device.BatteryLevel}}
- {{device.BatteryLevel.value}}%
- {{/if}}
- {{#if device.ramUsage}}
- {{device.ramUsage.value}}%
- {{/if}}
- {{#if device.internalMemory}}
- {{device.internalMemory.usage}}
- GB/{{device.internalMemory.total}}GB
- {{/if}}
- {{#if device.externalMemory}}
- {{device.externalMemory.usage}}
- GB/{{device.externalMemory.total}}GB
+
+ {{#if device.deviceInfoAvailable}}
+ {{#if device.BatteryLevel}}
+
{{device.BatteryLevel.value}}%
+ {{/if}}
+ {{#if device.ramUsage}}
+
{{device.ramUsage.value}}%
+ {{/if}}
+ {{#if device.internalMemory}}
+
{{device.internalMemory.usage}}
+ GB/{{device.internalMemory.total}}GB
+ {{/if}}
+ {{#if device.externalMemory}}
+
{{device.externalMemory.usage}}
+ GB/{{device.externalMemory.total}}GB
+ {{/if}}
+ {{else}}
+
Battery, RAM and Storage related information are not
+ available yet.
{{/if}}
- {{else}}
-
Battery, RAM and Storage related information are not
- available yet.
- {{/if}}
+
{{device.BatteryLevel.value}}%
+
+ {{#if device.deviceInfoAvailable}}
+ {{#if device.BatteryLevel}}
+
{{device.BatteryLevel.value}}%
+ {{/if}}
+ {{#if device.ramUsage}}
+
{{device.ramUsage.value}} MB
+ {{/if}}
+ {{#if device.internalMemory}}
+
{{device.internalMemory.value}} GB
+
+ {{/if}}
+ {{else}}
+
Battery, RAM and Storage related information are not
+ available yet.
{{/if}}
- {{#if device.ramUsage}}
-
{{device.ramUsage.value}} MB
- {{/if}}
- {{#if device.internalMemory}}
-
{{device.internalMemory.value}} GB
-
- {{/if}}
- {{else}}
-
Battery, RAM and Storage related information are not
- available yet.
- {{/if}}
+
+