diff --git a/.gitignore b/.gitignore
index 3bdf4fe951..4277d95b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -371,3 +371,4 @@ ASALocalRun/
*.lzma
*.cab
.DS_Store
+/.project
diff --git a/solutions/android/VirtualAssistantClient/.gitignore b/solutions/android/VirtualAssistantClient/.gitignore
new file mode 100644
index 0000000000..2b75303ac5
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/.gitignore
@@ -0,0 +1,13 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild
diff --git a/solutions/android/VirtualAssistantClient/app/.gitignore b/solutions/android/VirtualAssistantClient/app/.gitignore
new file mode 100644
index 0000000000..9551f44fa5
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/.gitignore
@@ -0,0 +1,2 @@
+/build
+!/src/debug
diff --git a/solutions/android/VirtualAssistantClient/app/build.gradle b/solutions/android/VirtualAssistantClient/app/build.gradle
new file mode 100644
index 0000000000..b5f153a547
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/build.gradle
@@ -0,0 +1,66 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 28
+ defaultConfig {
+ applicationId "com.microsoft.bot.builder.solutions.virtualassistant"
+ minSdkVersion 24
+ targetSdkVersion 28
+ versionCode 1
+ versionName "1.0"
+ }
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ }
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_8
+ targetCompatibility JavaVersion.VERSION_1_8
+ }
+}
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ implementation fileTree(include: ['*.jar'], dir: 'libs')
+
+ // Android Support
+ implementation 'com.android.support:recyclerview-v7:28.0.0'
+ implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+ implementation 'com.android.support:design:28.0.0'
+
+ // Butterknife
+ implementation 'com.jakewharton:butterknife:8.8.1'
+ annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
+
+ // for Events
+ implementation 'org.greenrobot:eventbus:3.1.1'
+
+ // for adaptive card rendering, see https://mvnrepository.com/artifact/io.adaptivecards/adaptivecards-android
+ implementation 'io.adaptivecards:adaptivecards-android:1.2.0-beta1'
+
+ // JSON
+ implementation "com.google.code.gson:gson:2.8.4"
+
+ // rxJava
+ implementation 'com.tbruyelle.rxpermissions:rxpermissions:0.7.0@aar'
+ implementation 'io.reactivex:rxandroid:1.2.1'
+ implementation 'io.reactivex:rxjava:1.1.6'
+
+ // Material Dialogs
+ implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
+
+ // fused API
+ implementation "com.google.android.gms:play-services-location:16.0.0"
+ implementation "com.android.support:support-media-compat:28.0.0"
+//fixes fused API outdated library
+ implementation "com.android.support:support-v4:28.0.0"//fixes fused API outdated library
+
+ // Direct Line Speech (local module)
+ implementation project(':directlinespeech')
+}
diff --git a/solutions/android/VirtualAssistantClient/app/proguard-rules.pro b/solutions/android/VirtualAssistantClient/app/proguard-rules.pro
new file mode 100644
index 0000000000..f1b424510d
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/solutions/android/VirtualAssistantClient/app/src/debug/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/configuration/DefaultConfiguration.java b/solutions/android/VirtualAssistantClient/app/src/debug/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/configuration/DefaultConfiguration.java
new file mode 100644
index 0000000000..14966873bd
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/debug/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/configuration/DefaultConfiguration.java
@@ -0,0 +1,22 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.configuration;
+
+public class DefaultConfiguration {
+
+ // Replace below with your own subscription key
+ public static final String COGNITIVE_SERVICES_SUBSCRIPTION_KEY = "YOUR_KEY_HERE";//TODO
+
+ public static final String BOT_ID = "YOUR_BOT_ID_HERE";//TODO
+
+ public static final String SPEECH_REGION = "westus2";
+
+ public static final String VOICE_NAME = "Microsoft Server Speech Text to Speech Voice (en-US, JessaNeural)";
+
+ public static final String DIRECT_LINE_CONSTANT = "directline";
+ public static final String USER_NAME = "User";
+ public static final String USER_ID = "YOUR_USER_ID_HERE";//TODO
+
+ public static final String LOCALE = "en-us";
+
+ public static final String GEOLOCATION_LAT = "47.617305";
+ public static final String GEOLOCATION_LON = "-122.192217";
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/AndroidManifest.xml b/solutions/android/VirtualAssistantClient/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..dcb2085435
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/AndroidManifest.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/assets/keywords/computer/kws.table b/solutions/android/VirtualAssistantClient/app/src/main/assets/keywords/computer/kws.table
new file mode 100644
index 0000000000..1140e4a54c
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/assets/keywords/computer/kws.table differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/assets/webchat.html b/solutions/android/VirtualAssistantClient/app/src/main/assets/webchat.html
new file mode 100644
index 0000000000..32d9d23767
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/assets/webchat.html
@@ -0,0 +1,353 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/MainApplication.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/MainApplication.java
new file mode 100644
index 0000000000..98464d82e9
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/MainApplication.java
@@ -0,0 +1,28 @@
+package com.microsoft.bot.builder.solutions.virtualassistant;
+
+import android.app.Application;
+import android.content.Intent;
+import android.support.v4.content.ContextCompat;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.service.SpeechService;
+
+public class MainApplication extends Application {
+
+ // STATE
+ private static MainApplication instance;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ instance = this;
+
+ // start service but don't initialize it yet
+ Intent intent = new Intent(this, SpeechService.class);
+ intent.setAction(SpeechService.ACTION_START_FOREGROUND_SERVICE);
+ ContextCompat.startForegroundService(this, intent);
+ }
+
+ public static MainApplication getInstance(){
+ return instance;
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/BaseActivity.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/BaseActivity.java
new file mode 100644
index 0000000000..785f6df122
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/BaseActivity.java
@@ -0,0 +1,220 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.ActivityCompat;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.Toast;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+import com.microsoft.bot.builder.solutions.virtualassistant.service.ServiceBinder;
+import com.microsoft.bot.builder.solutions.virtualassistant.service.SpeechService;
+
+/**
+ * This base class provides functionality that is reusable in Activities of this app
+ */
+public abstract class BaseActivity extends AppCompatActivity {
+
+ // Constants
+ private static final Integer PERMISSION_REQUEST_RECORD_AUDIO = 101;
+ private static final Integer PERMISSION_REQUEST_FINE_LOCATION = 102;
+ private static final String SHARED_PREFS_NAME = "my_shared_prefs";
+ protected static final String SHARED_PREF_SHOW_TEXTINPUT = "SHARED_PREF_SHOW_TEXTINPUT";
+
+ // State
+ private SharedPreferences sharedPreferences;
+ protected SpeechService speechServiceBinder;
+
+ // Override these
+ protected void permissionDenied(String manifestPermission){};
+ protected void permissionGranted(String manifestPermission){};
+ protected void serviceConnected(){};
+
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ sharedPreferences = getSharedPreferences(SHARED_PREFS_NAME, MODE_PRIVATE);
+ setupMainWindowDisplayMode();
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ setSystemUiVisilityMode();
+ }
+
+ private void setupMainWindowDisplayMode() {
+ View decorView = setSystemUiVisilityMode();
+ decorView.setOnSystemUiVisibilityChangeListener(visibility -> {
+ setSystemUiVisilityMode(); // Needed to avoid exiting immersive_sticky when keyboard is displayed
+ });
+ }
+
+ private View setSystemUiVisilityMode() {
+ View decorView = getWindow().getDecorView();
+ int options;
+ options =
+ View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+ | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+ | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+ | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION // hide nav bar
+ | View.SYSTEM_UI_FLAG_FULLSCREEN // hide status bar
+ | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+
+ decorView.setSystemUiVisibility(options);
+ return decorView;
+ }
+
+ protected void hideKeyboardFrom(View view) {
+ InputMethodManager imm = (InputMethodManager) getSystemService(Activity.INPUT_METHOD_SERVICE);
+ imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
+
+ protected void showSnackbar(View view, String message){
+ Snackbar.make(view, message, Snackbar.LENGTH_SHORT)
+ .setAction("Action", null)
+ .show();
+ }
+
+ protected void showToast(String message){
+ Toast.makeText(getApplicationContext(), message, Toast.LENGTH_LONG).show();
+ }
+
+ protected void putBooleanSharedPref(String prefName, boolean value){
+ SharedPreferences.Editor editor = sharedPreferences.edit();
+ editor.putBoolean(prefName, value);
+ editor.commit();
+ }
+
+ protected boolean getBooleanSharedPref(String prefName) {
+ return sharedPreferences.getBoolean(prefName, false);
+ }
+
+ /**
+ * Requests the RECORD_AUDIO and WRITE_EXTERNAL_STORAGE permissions as they are "Dangerous"
+ * If the permission has been denied previously, a dialog with extra rationale info will prompt
+ * the user to grant the permission, otherwise it is requested directly.
+ */
+ protected void requestRecordAudioPermissions() {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.RECORD_AUDIO)) {
+ // Provide an additional rationale to the user if the permission was not granted
+ // and the user would benefit from additional context for the use of the permission.
+ // For example if the user has previously denied the permission.
+ new AlertDialog.Builder(this)
+ .setTitle(getString(R.string.permission_record_audio_title))
+ .setMessage(getString(R.string.permission_record_audio_rationale))
+ .setCancelable(false)
+ .setPositiveButton(android.R.string.yes, (dialog, which) -> {
+ //re-request
+ ActivityCompat.requestPermissions(this,
+ new String[]{Manifest.permission.RECORD_AUDIO},
+ PERMISSION_REQUEST_RECORD_AUDIO);
+ })
+ .show();
+ } else {
+ // RECORD_AUDIO permission has not been granted yet. Request it directly.
+ ActivityCompat.requestPermissions(this,
+ new String[]{Manifest.permission.RECORD_AUDIO},
+ PERMISSION_REQUEST_RECORD_AUDIO);
+ }
+ }
+
+ protected void requestFineLocationPermissions() {
+ if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission.ACCESS_FINE_LOCATION)) {
+ // Provide an additional rationale to the user if the permission was not granted
+ // and the user would benefit from additional context for the use of the permission.
+ // For example if the user has previously denied the permission.
+ new AlertDialog.Builder(this)
+ .setTitle(getString(R.string.permission_access_fine_location_title))
+ .setMessage(getString(R.string.permission_access_fine_location_rationale))
+ .setCancelable(false)
+ .setPositiveButton(android.R.string.yes, (dialog, which) -> {
+ //re-request
+ ActivityCompat.requestPermissions(this,
+ new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
+ PERMISSION_REQUEST_FINE_LOCATION);
+ })
+ .show();
+ } else {
+ // ACCESS_FINE_LOCATION permission has not been granted yet. Request it directly.
+ ActivityCompat.requestPermissions(this,
+ new String[]{Manifest.permission.ACCESS_FINE_LOCATION},
+ PERMISSION_REQUEST_FINE_LOCATION);
+ }
+ }
+
+ /**
+ * Callback received when a permissions request has been completed.
+ */
+ @Override
+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+
+ // Received permission result for RECORD_AUDIO permission");
+ if (requestCode == PERMISSION_REQUEST_RECORD_AUDIO) {
+ if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+ // RECORD_AUDIO permission has been granted
+ permissionGranted(Manifest.permission.RECORD_AUDIO);
+ }
+ else {
+ permissionDenied(Manifest.permission.RECORD_AUDIO);
+ }
+ }
+
+ // Received permission result for ACCESS_FINE_LOCATION permission");
+ if (requestCode == PERMISSION_REQUEST_FINE_LOCATION) {
+ if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+ // permission has been granted
+ permissionGranted(Manifest.permission.ACCESS_FINE_LOCATION);
+ }
+ else {
+ permissionDenied(Manifest.permission.ACCESS_FINE_LOCATION);
+ }
+ }
+ }
+
+ public void doBindService() {
+ Intent intent = null;
+ intent = new Intent(this, SpeechService.class);
+ bindService(intent, myConnection, Context.BIND_AUTO_CREATE);
+ }
+
+ public ServiceConnection myConnection = new ServiceConnection() {
+
+ public void onServiceConnected(ComponentName className, IBinder binder) {
+ speechServiceBinder = ((ServiceBinder) binder).getSpeechService();
+ Log.d("ServiceConnection","connected");
+ // now use speechServiceBinder to execute methods in the service
+ serviceConnected();
+ }
+
+ public void onServiceDisconnected(ComponentName className) {
+ Log.d("ServiceConnection","disconnected");
+ speechServiceBinder = null;
+ }
+ };
+
+ protected void initializeAndConnect(){
+ if (speechServiceBinder != null) {
+ speechServiceBinder.initializeSpeechSdk(true);
+ speechServiceBinder.getSpeechSdk().connectAsync();
+ } else {
+ Log.e("ServiceConnection", "do not have a binding to the service");
+ }
+ }
+
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/botconfiguration/BotConfigurationActivity.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/botconfiguration/BotConfigurationActivity.java
new file mode 100644
index 0000000000..789ffefac4
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/botconfiguration/BotConfigurationActivity.java
@@ -0,0 +1,120 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.botconfiguration;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TextInputEditText;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+
+import com.microsoft.bot.builder.solutions.directlinespeech.model.Configuration;
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.BaseActivity;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.OnEditorAction;
+
+/**
+ * Bot Configuration Activity - settings to change the connection to the Bot
+ * Note: settings are saved when OK is pressed
+ */
+public class BotConfigurationActivity extends BaseActivity {
+
+ // VIEWS
+ @BindView(R.id.service_key) TextInputEditText serviceKey;
+ @BindView(R.id.service_region) TextInputEditText serviceRegion;
+ @BindView(R.id.bot_id) TextInputEditText botId;
+ @BindView(R.id.voice_name) TextInputEditText voiceName;
+ @BindView(R.id.user_id) TextInputEditText userId;
+ @BindView(R.id.locale) TextInputEditText locale;
+ @BindView(R.id.geolocation_lat) TextInputEditText locationLat;
+ @BindView(R.id.geolocation_lon) TextInputEditText locationLon;
+
+ // CONSTANTS
+ private static final int CONTENT_VIEW = R.layout.activity_bot_configuration;
+
+ // STATE
+ private Configuration configuration;
+
+ public static Intent getNewIntent(Context context) {
+ return new Intent(context, BotConfigurationActivity.class);
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(CONTENT_VIEW);
+ ButterKnife.bind(this);
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ if (speechServiceBinder == null) {
+ doBindService();
+ }
+ }
+
+ @Override
+ public void onStop() {
+ if (speechServiceBinder != null) {
+ unbindService(myConnection);
+ speechServiceBinder = null;
+ }
+ super.onStop();
+ }
+
+ @Override
+ protected void serviceConnected() {
+ showConfiguration();
+ }
+
+ @OnEditorAction({R.id.service_key, R.id.service_region, R.id.bot_id, R.id.voice_name, R.id.user_id, R.id.locale, R.id.geolocation_lat, R.id.geolocation_lon})
+ boolean onEditorAction(int actionId, KeyEvent key){
+ boolean handled = false;
+ if (actionId == EditorInfo.IME_ACTION_SEND || (key != null && key.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+ hideKeyboardFrom(getCurrentFocus());
+ handled = true;
+ }
+ return handled;
+ }
+
+ @OnClick(R.id.btn_cancel)
+ public void onClickCancel() {
+ finish();
+ }
+
+ @OnClick(R.id.btn_ok)
+ public void onClickOk() {
+ saveConfiguration();// must save updated config first
+ initializeAndConnect();// re-init service to make it read updated config
+ finish();
+ }
+
+ private void showConfiguration(){
+ configuration = speechServiceBinder.getConfiguration();
+ serviceKey.setText(configuration.serviceKey);
+ serviceRegion.setText(configuration.serviceRegion);
+ botId.setText(configuration.botId);
+ voiceName.setText(configuration.voiceName);
+ userId.setText(configuration.userId);
+ locale.setText(configuration.locale);
+ locationLat.setText(configuration.geolat);
+ locationLon.setText(configuration.geolon);
+ }
+
+ private void saveConfiguration(){
+ configuration.serviceKey = serviceKey.getText().toString();
+ configuration.serviceRegion = serviceRegion.getText().toString();
+ configuration.botId = botId.getText().toString();
+ configuration.voiceName = voiceName.getText().toString();
+ configuration.userId = userId.getText().toString();
+ configuration.locale = locale.getText().toString();
+ configuration.geolat = locationLat.getText().toString();
+ configuration.geolon = locationLon.getText().toString();
+ speechServiceBinder.setConfiguration(configuration);
+ }
+
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/configuration/AppConfigurationActivity.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/configuration/AppConfigurationActivity.java
new file mode 100644
index 0000000000..a191bf779b
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/configuration/AppConfigurationActivity.java
@@ -0,0 +1,85 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.configuration;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TextInputEditText;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+
+import com.microsoft.bot.builder.solutions.directlinespeech.ConfigurationManager;
+import com.microsoft.bot.builder.solutions.directlinespeech.model.Configuration;
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.BaseActivity;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.OnEditorAction;
+
+/**
+ * App Configuration Activity - settings to change the way the app behaves
+ * Note: settings are saved when OK is pressed
+ */
+public class AppConfigurationActivity extends BaseActivity {
+
+ // VIEWS
+ @BindView(R.id.history_linecount) TextInputEditText historyLinecount;
+
+ // CONSTANTS
+ private static final int CONTENT_VIEW = R.layout.activity_app_configuration;
+
+ // STATE
+ private Configuration configuration;
+ private ConfigurationManager configurationManager;
+
+ public static Intent getNewIntent(Context context) {
+ return new Intent(context, AppConfigurationActivity.class);
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(CONTENT_VIEW);
+ ButterKnife.bind(this);
+
+ configurationManager = new ConfigurationManager(this);
+ configuration = configurationManager.getConfiguration();
+
+ showConfiguration();
+ }
+
+ @OnEditorAction({R.id.history_linecount})
+ boolean onEditorAction(int actionId, KeyEvent key){
+ boolean handled = false;
+ if (actionId == EditorInfo.IME_ACTION_SEND || (key != null && key.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+ hideKeyboardFrom(getCurrentFocus());
+ handled = true;
+ }
+ return handled;
+ }
+
+ @OnClick(R.id.btn_cancel)
+ public void onClickCancel() {
+ finish();
+ }
+
+ @OnClick(R.id.btn_ok)
+ public void onClickOk() {
+ saveConfiguration();// must save updated config first
+ finish();
+ }
+
+ private void showConfiguration(){
+ int iHistoryLinecount = configuration.historyLinecount==null?1:configuration.historyLinecount;
+ String historyLineCount = String.valueOf(iHistoryLinecount);
+ historyLinecount.setText(historyLineCount);
+ }
+
+ private void saveConfiguration(){
+ configuration.historyLinecount = Integer.valueOf(historyLinecount.getText().toString());
+ if (configuration.historyLinecount == 0) configuration.historyLinecount = 1;//do not allow 0
+ configurationManager.setConfiguration(configuration);
+ }
+
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/MainActivity.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/MainActivity.java
new file mode 100644
index 0000000000..e15cdd4249
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/MainActivity.java
@@ -0,0 +1,382 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.main;
+
+import android.Manifest;
+import android.app.assist.AssistContent;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.support.design.widget.NavigationView;
+import android.support.design.widget.TextInputEditText;
+import android.support.design.widget.TextInputLayout;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SwitchCompat;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.microsoft.bot.builder.solutions.directlinespeech.ConfigurationManager;
+import com.microsoft.bot.builder.solutions.directlinespeech.model.Configuration;
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.BaseActivity;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.botconfiguration.BotConfigurationActivity;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.configuration.AppConfigurationActivity;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.list.ChatAdapter;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.list.ItemOffsetDecoration;
+import com.microsoft.bot.builder.solutions.virtualassistant.assistant.VoiceInteractionActivity;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnCheckedChanged;
+import butterknife.OnClick;
+import butterknife.OnEditorAction;
+import client.model.BotConnectorActivity;
+import events.ActivityReceived;
+import events.Disconnected;
+import events.Recognized;
+import events.RecognizedIntermediateResult;
+
+public class MainActivity extends BaseActivity implements NavigationView.OnNavigationItemSelectedListener {
+
+ // VIEWS
+ @BindView(R.id.root_container) RelativeLayout uiContainer;
+ @BindView(R.id.recyclerview) RecyclerView chatRecyclerView;
+ @BindView(R.id.textinputlayout) TextInputLayout textInputLayout;
+ @BindView(R.id.textinput) TextInputEditText textInput;
+ @BindView(R.id.drawer_layout) DrawerLayout drawer;
+ @BindView(R.id.nav_view) NavigationView navigationView;
+ @BindView(R.id.switch_show_textinput) SwitchCompat switchShowTextInput;
+ @BindView(R.id.speech_detection) TextView detectedSpeechToText;
+ @BindView(R.id.agent_image) ImageView agentImage;
+
+ // CONSTANTS
+ private static final int CONTENT_VIEW = R.layout.activity_main;
+ private static final String LOGTAG = "MainActivity";
+
+ // STATE
+ private ChatAdapter chatAdapter;
+ private boolean alwaysShowTextInput;
+ private Handler handler;
+ private boolean launchedAsAssistant;
+
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(CONTENT_VIEW);
+ ButterKnife.bind(this);
+
+ handler = new Handler(Looper.getMainLooper());
+
+
+ // Options hidden in the nav-drawer
+ alwaysShowTextInput = getBooleanSharedPref(SHARED_PREF_SHOW_TEXTINPUT);
+ switchShowTextInput.setChecked(alwaysShowTextInput);
+
+ // NAV DRAWER
+ ActionBarDrawerToggle toggle = new ActionBarDrawerToggle( this, drawer, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+ drawer.addDrawerListener(toggle);
+ toggle.syncState();
+ navigationView.setNavigationItemSelectedListener(this);
+
+ // handle dangerous permissions
+ if (ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+ requestRecordAudioPermissions();
+ } else {
+ if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+ requestFineLocationPermissions();
+ }
+ }
+
+ // make media volume the default
+ setVolumeControlStream(AudioManager.STREAM_MUSIC);
+
+ setupChatRecyclerView();
+
+ // check if this activity was launched as an assistant
+ Intent intent = getIntent();
+ if (intent != null) {
+ String originator = intent.getStringExtra(VoiceInteractionActivity.KEY_ORIGINATOR);
+ if (originator != null && originator.equals(VoiceInteractionActivity.KEY_VALUE)) {
+ launchedAsAssistant = true;//this flag can now be used, i.e. to automtically start microphone recording
+ }
+ }
+
+ }
+
+ // Register for EventBus messages and SpeechService
+ @Override
+ public void onStart() {
+ super.onStart();
+ EventBus.getDefault().register(this);
+ if (speechServiceBinder == null) {
+ doBindService();
+ }
+ }
+
+ @Override
+ protected void onResume() {
+ super.onResume();
+ final ConfigurationManager configurationManager = new ConfigurationManager(this);
+ final Configuration configuration = configurationManager.getConfiguration();
+ chatAdapter.setChatItemHistoryCount(configuration.historyLinecount==null?1:configuration.historyLinecount);
+ }
+
+ // Unregister EventBus messages and SpeechService
+ @Override
+ public void onStop() {
+ Log.v("BaseActivity","onStop() finished");
+ EventBus.getDefault().unregister(this);
+ if (speechServiceBinder != null) {
+ unbindService(myConnection);
+ speechServiceBinder = null;
+ }
+ super.onStop();
+ }
+
+ private void setupChatRecyclerView() {
+
+ chatAdapter = new ChatAdapter();
+ chatRecyclerView.setAdapter(chatAdapter);
+
+ LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+ layoutManager.setStackFromEnd(true);
+ chatRecyclerView.setLayoutManager(layoutManager);
+
+ final int spacing = getResources().getDimensionPixelOffset(R.dimen.list_item_spacing_small);
+ chatRecyclerView.addItemDecoration(new ItemOffsetDecoration(spacing));
+ }
+
+ @Override
+ protected void permissionDenied(String manifestPermission) {
+ if (manifestPermission.equals(Manifest.permission.RECORD_AUDIO)){
+ speechServiceBinder.initializeSpeechSdk(false);
+ speechServiceBinder.getSpeechSdk().connectAsync();
+ agentImage.setVisibility(View.GONE);//hide the assistant since voice is deactivated
+ textInputLayout.setVisibility(View.VISIBLE);// show the text-input prompt
+ }
+ }
+
+ @Override
+ protected void permissionGranted(String manifestPermission) {
+ // this code is triggered when a user launches app a 1st time and doesn't have permisison yet
+ if (manifestPermission.equals(Manifest.permission.RECORD_AUDIO)){
+ if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+ requestFineLocationPermissions();
+ } else {
+ initializeAndConnect();
+ }
+ }
+ if (manifestPermission.equals(Manifest.permission.ACCESS_FINE_LOCATION)){
+ if (speechServiceBinder != null) speechServiceBinder.startLocationUpdates();
+ initializeAndConnect();
+ }
+ }
+
+ @Override
+ protected void serviceConnected() {
+ // this code is triggered when a user launches the app a second+ time and the app has permission
+ if (ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
+ initializeAndConnect();
+ }
+ }
+
+ @Override
+ public boolean onNavigationItemSelected(MenuItem item) {
+ int id = item.getItemId();
+
+ switch (id) {
+ case R.id.nav_menu_configuration:
+ startActivity(BotConfigurationActivity.getNewIntent(this));
+ break;
+ case R.id.nav_menu_app_configuration:
+ startActivity(AppConfigurationActivity.getNewIntent(this));
+ break;
+ case R.id.nav_menu_reset_bot:
+ speechServiceBinder.getSpeechSdk().resetBot();
+ break;
+ case R.id.nav_menu_location:
+ Configuration configuration = speechServiceBinder.getConfiguration();
+ speechServiceBinder.getSpeechSdk().sendLocationEvent(configuration.geolat, configuration.geolon);
+ break;
+ case R.id.nav_menu_welcome_req:
+ speechServiceBinder.getSpeechSdk().requestWelcomeCard();
+ break;
+ case R.id.nav_menu_emulate_activity_msg:
+ final String testJson =
+ "{\"attachmentLayout\":\"carousel\",\"attachments\":[{\"content\":{\"body\":[{\"items\":[{\"columns\":[{\"items\":[{\"color\":\"accent\",\"id\":\"Name\",\"separation\":\"none\",\"size\":\"large\",\"spacing\":\"none\",\"text\":\"City Center Plaza\",\"type\":\"TextBlock\",\"weight\":\"bolder\"},{\"id\":\"AvailableDetails\",\"isSubtle\":true,\"separation\":\"none\",\"spacing\":\"none\",\"text\":\"Parking Garage\",\"type\":\"TextBlock\"},{\"color\":\"dark\",\"id\":\"Address\",\"isSubtle\":true,\"separation\":\"none\",\"spacing\":\"none\",\"text\":\"474 108th Avenue Northeast, Bellevue, West Bellevue\",\"type\":\"TextBlock\",\"wrap\":true},{\"color\":\"dark\",\"id\":\"Hours\",\"isSubtle\":true,\"separation\":\"none\",\"spacing\":\"none\",\"text\":\"\",\"type\":\"TextBlock\",\"wrap\":true}],\"type\":\"Column\",\"verticalContentAlignment\":\"Center\",\"width\":\"90\"}],\"type\":\"ColumnSet\"}],\"type\":\"Container\"},{\"items\":[{\"id\":\"Image\",\"type\":\"Image\",\"url\":\"https://atlas.microsoft.com/map/static/png?api-version=1.0&layer=basic&style=main&zoom=15¢er=-122.19475,47.61426&width=512&height=512&subscription-key=X0_-LfxI-A-iXxsBGb62ZZJfdfr5mbw9LiG8-cL6quM\"}],\"separator\":true,\"type\":\"Container\"}],\"id\":\"PointOfInterestViewCard\",\"speak\":\"City Center Plaza at 474 108th Avenue Northeast\",\"type\":\"AdaptiveCard\",\"version\":\"1.0\"},\"contentType\":\"application/vnd.microsoft.card.adaptive\"},{\"content\":{\"body\":[{\"items\":[{\"columns\":[{\"items\":[{\"color\":\"accent\",\"id\":\"Name\",\"separation\":\"none\",\"size\":\"large\",\"spacing\":\"none\",\"text\":\"Plaza Center\",\"type\":\"TextBlock\",\"weight\":\"bolder\"},{\"id\":\"AvailableDetails\",\"isSubtle\":true,\"separation\":\"none\",\"spacing\":\"none\",\"text\":\"Parking Garage\",\"type\":\"TextBlock\"},{\"color\":\"dark\",\"id\":\"Address\",\"isSubtle\":true,\"separation\":\"none\",\"spacing\":\"none\",\"text\":\"10901 NE 9th St, Bellevue, Northwest Bellevue\",\"type\":\"TextBlock\",\"wrap\":true},{\"color\":\"dark\",\"id\":\"Hours\",\"isSubtle\":true,\"separation\":\"none\",\"spacing\":\"none\",\"text\":\"\",\"type\":\"TextBlock\",\"wrap\":true}],\"type\":\"Column\",\"verticalContentAlignment\":\"Center\",\"width\":\"90\"}],\"type\":\"ColumnSet\"}],\"type\":\"Container\"},{\"items\":[{\"id\":\"Image\",\"type\":\"Image\",\"url\":\"https://atlas.microsoft.com/map/static/png?api-version=1.0&layer=basic&style=main&zoom=15¢er=-122.19493,47.61793&width=512&height=512&subscription-key=X0_-LfxI-A-iXxsBGb62ZZJfdfr5mbw9LiG8-cL6quM\"}],\"separator\":true,\"type\":\"Container\"}],\"id\":\"PointOfInterestViewCard\",\"speak\":\"Plaza Center at 10901 NE 9th St\",\"type\":\"AdaptiveCard\",\"version\":\"1.0\"},\"contentType\":\"application/vnd.microsoft.card.adaptive\"}],\"channelData\":{\"conversationalAiData\":{\"requestInfo\":{\"interactionId\":\"b9ad8f12-e459-4a73-a542-919224e83b0a\",\"requestType\":0,\"version\":\"0.2\"}}},\"channelId\":\"directlinespeech\",\"conversation\":{\"id\":\"490b89e7-ab99-4ec6-b0c8-4cc612d5e4ce\",\"isGroup\":false},\"entities\":[],\"from\":{\"id\":\"vakonadj\"},\"id\":\"a27c2f8da5a845a3942f6a880562114f\",\"inputHint\":\"expectingInput\",\"recipient\":{\"id\":\"490b89e7-ab99-4ec6-b0c8-4cc612d5e4ce|0000\"},\"replyToId\":\"c3174265-3b0a-49a1-bdb1-e55c477b8c36\",\"serviceUrl\":\"PersistentConnection\",\"speak\":\"What do you think of these?,1 - City Center Plaza at 474 108th Avenue Northeast.,2 - Plaza Center at 10901 NE 9th St.\",\"text\":\"What do you think of these?\",\"timestamp\":\"2019-04-25T18:17:12.3964213+00:00\",\"type\":\"message\"}";
+ speechServiceBinder.getSpeechSdk().activityReceived(testJson);
+ break;
+ case R.id.nav_menu_show_assistant_settings:
+ startActivity(new Intent(Settings.ACTION_VOICE_INPUT_SETTINGS));
+ break;
+ }
+
+ drawer.closeDrawer(GravityCompat.START);
+
+ return true;
+ }
+
+ @OnClick(R.id.agent_image)
+ public void onAssistantClick() {
+ showSnackbar(uiContainer, getString(R.string.msg_listening));
+ speechServiceBinder.getSpeechSdk().listenOnceAsync();
+ }
+
+ @OnCheckedChanged(R.id.switch_show_textinput)
+ public void OnShowTextInput(CompoundButton button, boolean checked){
+ alwaysShowTextInput = checked;
+ putBooleanSharedPref(SHARED_PREF_SHOW_TEXTINPUT, checked);
+ if (alwaysShowTextInput)
+ textInputLayout.setVisibility(View.VISIBLE);
+ else
+ textInputLayout.setVisibility(View.GONE);
+ }
+
+ @OnEditorAction(R.id.textinput)
+ boolean onEditorAction(int actionId, KeyEvent key){
+ boolean handled = false;
+ if (actionId == EditorInfo.IME_ACTION_SEND || (key != null && key.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
+ sendTextMessage(textInput.getEditableText().toString());
+ textInput.setText("");
+ hideKeyboardFrom(textInput);
+ handled = true;
+ }
+ return handled;
+ }
+
+ // send text message
+ private void sendTextMessage(String msg){
+ speechServiceBinder.getSpeechSdk().sendActivityMessageAsync(msg);
+ }
+
+ // EventBus: the user spoke and the app recognized intermediate speech
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onDisconnectedEvent(Disconnected event) {
+ detectedSpeechToText.setText(R.string.msg_disconnected);
+ boolean havePermission = ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
+ speechServiceBinder.initializeSpeechSdk(havePermission);
+ speechServiceBinder.getSpeechSdk().connectAsync();
+ handler.postDelayed(() -> {
+ detectedSpeechToText.setText("");
+ }, 2000);
+ }
+
+ // EventBus: the user spoke and the app recognized intermediate speech
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onRecognizedIntermediateResultEvent(RecognizedIntermediateResult event) {
+ detectedSpeechToText.setText(event.recognized_speech);
+ }
+
+ // EventBus: the user spoke and the app recognized the speech. Disconnect mic.
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onRecognizedEvent(Recognized event) {
+ detectedSpeechToText.setText(event.recognized_speech);
+ // in 2 seconds clear the text (at this point the bot should be giving its' response)
+ handler.postDelayed(() -> detectedSpeechToText.setText(""), 2000);
+ }
+
+ // EventBus: received a response from Bot
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onActivityReceivedEvent(ActivityReceived activityReceived) throws IOException {
+ if (activityReceived.botConnectorActivity != null) {
+ BotConnectorActivity botConnectorActivity = activityReceived.botConnectorActivity;
+
+ String amount;
+
+ switch (botConnectorActivity.getType()) {
+ case "message":
+ chatAdapter.addChat(botConnectorActivity, this);
+ // make the chat list scroll automatically after adding a bot response
+ chatRecyclerView.getLayoutManager().scrollToPosition(chatAdapter.getItemCount() - 1);
+ break;
+ case "dialogState":
+ Log.i(LOGTAG, "Activity with DialogState");
+ break;
+ case "PlayLocalFile":
+ Log.i(LOGTAG, "Activity with PlayLocalFile");
+ playMediaStream(botConnectorActivity.getFile());
+ break;
+ default:
+ break;
+ }
+ }
+ }
+
+ private void playMediaStream(String mediaStream) {
+ try {
+ MediaPlayer mediaPlayer = new MediaPlayer();
+ mediaPlayer.setDataSource(mediaStream);
+ mediaPlayer.prepare();
+ mediaPlayer.start();
+ }
+ catch(IOException e) {
+ Log.e(LOGTAG, "IOexception " + e.getMessage());
+ }
+
+ }
+
+ // provide additional data to the Assistant
+ // improve the assistant user experience by providing content-related references related to the current activity
+ @Override
+ public void onProvideAssistContent(AssistContent outContent) {
+ super.onProvideAssistContent(outContent);
+ //NOTE: to test the data you're passing in, see https://search.google.com/structured-data/testing-tool/u/0/
+ // ALSO: see https://schema.org/ for the vocabulary
+
+ // three examples :
+// outContent.setWebUri(
+// Uri.parse(
+// "http://www.goodreads.com/book/show/13023.Alice_in_Wonderland"
+// )
+// );
+// outContent.setStructuredData(
+// new JSONObject()
+// .put("@type", "Book")
+// .put("author", "Lewis Carroll")
+// .put("name", "Alice in Wonderland")
+// .put("description",
+// "This is an 1865 novel about a girl named Alice, " +
+// "who falls through a rabbit hole and " +
+// "enters a fantasy world."
+// ).toString()
+// );
+
+ try {
+ String structuredJson = new JSONObject()
+ .put("@type", "MusicRecording")
+ .put("@id", "https://example.com/music/recording")
+ .put("name", "Album Title")
+ .put("description", "Album Description")
+ .toString();
+
+ outContent.setStructuredData(structuredJson);
+ } catch (JSONException e) {
+ e.printStackTrace();
+ }
+
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ActionHandler.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ActionHandler.java
new file mode 100644
index 0000000000..de55f9b272
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ActionHandler.java
@@ -0,0 +1,23 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.main.list;
+
+import io.adaptivecards.objectmodel.BaseActionElement;
+import io.adaptivecards.objectmodel.BaseCardElement;
+import io.adaptivecards.renderer.RenderedAdaptiveCard;
+import io.adaptivecards.renderer.actionhandler.ICardActionHandler;
+
+public class ActionHandler implements ICardActionHandler {
+ @Override
+ public void onAction(BaseActionElement baseActionElement, RenderedAdaptiveCard renderedAdaptiveCard) {
+
+ }
+
+ @Override
+ public void onMediaPlay(BaseCardElement baseCardElement, RenderedAdaptiveCard renderedAdaptiveCard) {
+
+ }
+
+ @Override
+ public void onMediaStop(BaseCardElement baseCardElement, RenderedAdaptiveCard renderedAdaptiveCard) {
+
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ChatAdapter.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ChatAdapter.java
new file mode 100644
index 0000000000..cbe5664f36
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ChatAdapter.java
@@ -0,0 +1,72 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.main.list;
+
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import client.model.BotConnectorActivity;
+
+public class ChatAdapter extends RecyclerView.Adapter {
+
+ // CONSTANTS
+ private final int CONTENT_VIEW = R.layout.item_chat;
+ private static final String LOGTAG = "ChatAdapter";
+
+ // STATE
+ private ArrayList chatList = new ArrayList<>();
+ private AppCompatActivity parentActivity;
+ private static int MAX_CHAT_ITEMS = 1;
+
+
+ @NonNull
+ @Override
+ public ChatViewholder onCreateViewHolder(@NonNull ViewGroup parent, int i) {
+ View view = LayoutInflater.from(parent.getContext()).inflate(CONTENT_VIEW, parent, false);
+ return new ChatViewholder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull ChatViewholder chatViewholder, int position) {
+ BotConnectorActivity botConnectorActivity = chatList.get(position);
+ chatViewholder.bind(botConnectorActivity, parentActivity);
+ }
+
+ @Override
+ public int getItemCount() {
+ if (chatList == null) return 0;
+ return chatList.size();
+ }
+
+ public void addChat(BotConnectorActivity botConnectorActivity, AppCompatActivity parentActivity) {
+ Log.v(LOGTAG, "showing row id "+ botConnectorActivity.getId());
+ this.parentActivity = parentActivity;
+ chatList.add(botConnectorActivity);
+ if (chatList.size() > MAX_CHAT_ITEMS) {
+ chatList.remove(0);
+ }
+ notifyDataSetChanged();
+ }
+
+ public void setChatItemHistoryCount(int count){
+ MAX_CHAT_ITEMS = count;
+ while (chatList.size() > MAX_CHAT_ITEMS) {
+ chatList.remove(0);
+ }
+ notifyDataSetChanged();
+ }
+
+ public void swapChatList(List newChatList) {
+ chatList.clear();
+ chatList.addAll(newChatList);
+ notifyDataSetChanged();
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ChatViewholder.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ChatViewholder.java
new file mode 100644
index 0000000000..4caf4f3cc3
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ChatViewholder.java
@@ -0,0 +1,106 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.main.list;
+
+import android.support.annotation.NonNull;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.CardView;
+import android.support.v7.widget.RecyclerView;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.google.gson.Gson;
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+import com.microsoft.bot.builder.solutions.virtualassistant.utils.RawUtils;
+
+import org.json.JSONObject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import client.model.BotConnectorActivity;
+import io.adaptivecards.objectmodel.AdaptiveCard;
+import io.adaptivecards.objectmodel.HostConfig;
+import io.adaptivecards.objectmodel.ParseResult;
+import io.adaptivecards.renderer.AdaptiveCardRenderer;
+import io.adaptivecards.renderer.RenderedAdaptiveCard;
+
+public class ChatViewholder extends RecyclerView.ViewHolder {
+
+ // CONSTANTS
+ private static final String LOGTAG = "ChatViewholder";
+
+ // VIEWS
+ @BindView(R.id.tv_bot_chat) TextView textMessage;
+ @BindView(R.id.adaptive_card_container) LinearLayout adaptiveCardLayout;
+
+ // STATE
+ private View view;
+ private ActionHandler cardActionHandler;
+
+ public ChatViewholder(@NonNull View itemView) {
+ super(itemView);
+ view = itemView;
+ ButterKnife.bind(this, view);
+ cardActionHandler = new ActionHandler();
+ }
+
+ /**
+ * bind the layout with the data
+ * @param botConnectorActivity data
+ */
+ void bind(@NonNull BotConnectorActivity botConnectorActivity, AppCompatActivity parentActivity) {
+ textMessage.setText(botConnectorActivity.getText());
+
+ if (botConnectorActivity.getAttachmentLayout() != null){
+ if (botConnectorActivity.getAttachmentLayout().equals("carousel") || botConnectorActivity.getAttachmentLayout().equals("list")){
+ Gson gson = new Gson();
+
+ adaptiveCardLayout.setVisibility(View.VISIBLE);
+ adaptiveCardLayout.removeAllViews();
+
+ // generate horizontal or vertical carousel of cards
+ for (int x = 0; x < botConnectorActivity.getAttachments().size(); x++) {
+ String cardJson = gson.toJson(botConnectorActivity.getAttachments().get(x));
+
+ try {
+ JSONObject cardJsonObject = new JSONObject(cardJson);
+ String cardBodyJson = cardJsonObject.getString("content");
+ logLargeString("Received Card: " + cardBodyJson);// this JSON can be used with https://adaptivecards.io/designer/
+
+ ParseResult parseResult = AdaptiveCard.DeserializeFromString(cardBodyJson, AdaptiveCardRenderer.VERSION);
+ AdaptiveCard adaptiveCard = parseResult.GetAdaptiveCard();
+ HostConfig hostConfig = HostConfig.DeserializeFromString(RawUtils.loadHostConfig(parentActivity));
+ RenderedAdaptiveCard renderedCard = AdaptiveCardRenderer.getInstance().render(parentActivity, parentActivity.getSupportFragmentManager(), adaptiveCard, cardActionHandler, hostConfig);
+
+ View adaptiveCardRendered = renderedCard.getView();
+
+ // add the card to its individual container to allow for resizing
+ View adaptiveCardView = LayoutInflater.from(parentActivity).inflate(R.layout.item_adaptive_card, adaptiveCardLayout, false);
+ CardView itemAdaptiveCard = adaptiveCardView.findViewById(R.id.adaptive_card_container);
+ itemAdaptiveCard.addView(adaptiveCardRendered);
+
+ // add the cards to the existing layout to make them visible
+ adaptiveCardLayout.addView(itemAdaptiveCard);
+
+ Log.d("ActionHandler", "renderedAdaptiveCard warnings: "+renderedCard.getWarnings().size() + " " + renderedCard.getWarnings().toString());
+ }
+ catch (Exception ex) {
+ Log.e(LOGTAG,"Error in json: " + ex.getMessage());
+ }
+ }
+ }
+ } else {
+ adaptiveCardLayout.setVisibility(View.GONE);
+ }
+ }
+
+ public void logLargeString(String str) {
+ if(str.length() > 3000) {
+ Log.i(LOGTAG, str.substring(0, 3000));
+ logLargeString(str.substring(3000));
+ } else {
+ Log.i(LOGTAG, str); // continuation
+ }
+ }
+}
\ No newline at end of file
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ItemOffsetDecoration.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ItemOffsetDecoration.java
new file mode 100644
index 0000000000..9d842d0530
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/activities/main/list/ItemOffsetDecoration.java
@@ -0,0 +1,20 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.activities.main.list;
+
+import android.graphics.Rect;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class ItemOffsetDecoration extends RecyclerView.ItemDecoration {
+
+ private int mSpacing;
+
+ public ItemOffsetDecoration(int itemOffset) {
+ mSpacing = itemOffset;
+ }
+
+ @Override
+ public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+ super.getItemOffsets(outRect, view, parent, state);
+ outRect.set(mSpacing, mSpacing, mSpacing, mSpacing);
+ }
+}
\ No newline at end of file
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantRecognitionService.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantRecognitionService.java
new file mode 100644
index 0000000000..ae0798492a
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantRecognitionService.java
@@ -0,0 +1,41 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.assistant;
+
+import android.content.Intent;
+import android.speech.RecognitionService;
+import android.util.Log;
+
+/**
+ * Stub recognition service needed to be a complete voice interactor.
+ */
+public class AssistantRecognitionService extends RecognitionService {
+
+ private static final String LOGTAG = "AssistantRecognitionSvc";
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ Log.i(LOGTAG, "onCreate");
+ }
+
+ @Override
+ protected void onStartListening(Intent recognizerIntent, Callback listener) {
+ Log.i(LOGTAG, "onStartListening");
+ }
+
+ @Override
+ protected void onCancel(Callback listener) {
+ Log.i(LOGTAG, "onCancel");
+ }
+
+ @Override
+ protected void onStopListening(Callback listener) {
+ Log.i(LOGTAG, "onStopListening");
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ Log.i(LOGTAG, "onDestroy");
+ }
+
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantService.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantService.java
new file mode 100644
index 0000000000..0902afe24b
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantService.java
@@ -0,0 +1,6 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.assistant;
+
+import android.service.voice.VoiceInteractionService;
+
+public class AssistantService extends VoiceInteractionService {
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantSession.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantSession.java
new file mode 100644
index 0000000000..acf835a549
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantSession.java
@@ -0,0 +1,72 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.assistant;
+
+import android.app.assist.AssistContent;
+import android.app.assist.AssistStructure;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Bundle;
+import android.service.voice.VoiceInteractionSession;
+import android.util.Log;
+
+public class AssistantSession extends VoiceInteractionSession {
+
+ // CONSTANTS
+ static final String LOGTAG = "AssistantSession";
+
+ // STATE
+ private Context context;
+
+ public AssistantSession(Context context) {
+ super(context);
+ this.context = context;
+ }
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ Log.i(LOGTAG, "onCreate");
+ }
+
+ @Override
+ public void onShow(Bundle args, int showFlags) {
+ super.onShow(args, showFlags);
+ Log.i(LOGTAG, "onShow: flags=0x" + Integer.toHexString(showFlags) + " args=" + args);
+ }
+
+ @Override
+ public void onHandleAssist(Bundle data, AssistStructure structure, AssistContent content) {
+ super.onHandleAssist(data, structure, content);
+
+ Log.i(LOGTAG, "onHandleAssist");
+ logAssistContentAndData(content, data);
+
+ Intent intent = new Intent(context, VoiceInteractionActivity.class);
+ startVoiceActivity(intent);
+ }
+
+ private void logAssistContentAndData(AssistContent content, Bundle data) {
+ if (content != null) {
+ Log.i(LOGTAG, "Assist intent: " + content.getIntent());
+ Log.i(LOGTAG, "Assist intent from app: " + content.isAppProvidedIntent());
+ Log.i(LOGTAG, "Assist clipdata: " + content.getClipData());
+ Log.i(LOGTAG, "Assist structured data: " + content.getStructuredData());
+ Log.i(LOGTAG, "Assist web uri: " + content.getWebUri());
+ Log.i(LOGTAG, "Assist web uri from app: " + content.isAppProvidedWebUri());
+ Log.i(LOGTAG, "Assist extras: " + content.getExtras());
+ }
+ if (data != null) {
+ Uri referrer = data.getParcelable(Intent.EXTRA_REFERRER);
+ if (referrer != null) {
+ Log.i(LOGTAG, "Referrer: " + referrer);
+ }
+ }
+ }
+
+ @Override
+ public void onHandleScreenshot(Bitmap screenshot) {
+ // this can provide a screenshot of the UI - check for null
+ }
+
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantSessionService.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantSessionService.java
new file mode 100644
index 0000000000..10962abbfc
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/AssistantSessionService.java
@@ -0,0 +1,13 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.assistant;
+
+import android.os.Bundle;
+import android.service.voice.VoiceInteractionSession;
+import android.service.voice.VoiceInteractionSessionService;
+
+public class AssistantSessionService extends VoiceInteractionSessionService {
+
+ @Override
+ public VoiceInteractionSession onNewSession(Bundle args) {
+ return(new AssistantSession(this));
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/VoiceInteractionActivity.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/VoiceInteractionActivity.java
new file mode 100644
index 0000000000..0f15238e8b
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/assistant/VoiceInteractionActivity.java
@@ -0,0 +1,31 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.assistant;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.main.MainActivity;
+
+/**
+ * this class is used to re-launch the LAUNCH activity
+ * Also, a special flag is added to let the MainActivity identify it's launched as an assistant
+ */
+public class VoiceInteractionActivity extends AppCompatActivity {
+
+ // CONSTANTS
+ public static final String KEY_ORIGINATOR = "KEY_ORIGINATOR";
+ public static final String KEY_VALUE = "VoiceInteractionActivityFlag";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ Intent intent = new Intent(Intent.ACTION_MAIN);
+ intent.addCategory(Intent.CATEGORY_LAUNCHER);
+ intent.setComponent(new ComponentName(this, MainActivity.class));
+ intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+ intent.putExtra(KEY_ORIGINATOR, KEY_VALUE);//special flag
+ startActivity(intent);
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/LocationProvider.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/LocationProvider.java
new file mode 100644
index 0000000000..4774e98f9d
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/LocationProvider.java
@@ -0,0 +1,105 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.service;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.os.Looper;
+import android.support.v4.app.ActivityCompat;
+import android.util.Log;
+
+import com.google.android.gms.common.ConnectionResult;
+import com.google.android.gms.common.GoogleApiAvailability;
+import com.google.android.gms.location.FusedLocationProviderClient;
+import com.google.android.gms.location.LocationCallback;
+import com.google.android.gms.location.LocationRequest;
+import com.google.android.gms.location.LocationResult;
+import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.LocationSettingsRequest;
+import com.google.android.gms.location.SettingsClient;
+
+
+public class LocationProvider {
+
+ // CONSTANTS
+ private static final int LOCATION_UPDATE_INTERVAL = 3 * 60 * 1000;// 3 mins
+ private static final float LOCATION_UPDATE_DISTANCE = 50;// distance (in meters) to move before receiving an update
+ private static final String LOGTAG = "LocationProvider";
+
+ // STATE
+ private boolean isGettingLocationUpdates;
+ private FusedLocationProviderClient fusedLocationClient;
+ private LocationCallback locationCallback;
+ private Context context;
+ private LocationProviderCallback locationProviderCallback;
+
+ // INTERFACE
+ public interface LocationProviderCallback {
+ void onLocationResult(Location location);
+ }
+
+ public LocationProvider(Context context, LocationProviderCallback locationProviderCallback) {
+ this.context = context;
+ this.locationProviderCallback = locationProviderCallback;
+ // check if Google Play Services is installed
+ isGettingLocationUpdates = checkPlayServices();
+ }
+
+ protected void startLocationUpdates() {
+ if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
+
+ fusedLocationClient = LocationServices.getFusedLocationProviderClient(context);
+
+ // register to receive future location updates
+ LocationRequest locationRequest = new LocationRequest()
+ .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
+ .setInterval(LOCATION_UPDATE_INTERVAL)
+ .setSmallestDisplacement(LOCATION_UPDATE_DISTANCE);
+
+ // Create LocationSettingsRequest object using location request
+ LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder();
+ builder.addLocationRequest(locationRequest);
+ LocationSettingsRequest locationSettingsRequest = builder.build();
+
+ // Check whether location settings are satisfied
+ // https://developers.google.com/android/reference/com/google/android/gms/location/SettingsClient
+ SettingsClient settingsClient = LocationServices.getSettingsClient(context);
+ settingsClient.checkLocationSettings(locationSettingsRequest);
+ locationCallback = new LocationCallback() {
+ @Override
+ public void onLocationResult(LocationResult locationResult) {
+ // Inform the Bot of the location change
+ Location location = locationResult.getLastLocation();
+ if (location != null && locationProviderCallback != null) {
+ locationProviderCallback.onLocationResult(location);
+ }
+ }
+ };
+
+ fusedLocationClient.requestLocationUpdates(locationRequest, locationCallback, Looper.myLooper());
+ } else {
+ //this will trigger the first time the app is run - just retry after getting permission
+ Log.e(LOGTAG, "Missing ACCESS_FINE_LOCATION permission");
+ }
+ }
+
+ public void stopLocationUpdates(){
+ // stop location updates
+ if (isGettingLocationUpdates && fusedLocationClient != null && locationCallback != null) {
+ fusedLocationClient.removeLocationUpdates(locationCallback);
+ }
+ }
+
+ private boolean checkPlayServices() {
+ GoogleApiAvailability apiAvailability = GoogleApiAvailability.getInstance();
+ int resultCode = apiAvailability.isGooglePlayServicesAvailable(context);
+ if (resultCode != ConnectionResult.SUCCESS) {
+ if (apiAvailability.isUserResolvableError(resultCode)) {
+ apiAvailability.showErrorNotification(context, resultCode);
+ }
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/ServiceBinder.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/ServiceBinder.java
new file mode 100644
index 0000000000..fa6cf90e9a
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/ServiceBinder.java
@@ -0,0 +1,16 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.service;
+
+import android.os.Binder;
+
+public class ServiceBinder extends Binder {
+
+ private SpeechService speechService;
+
+ public ServiceBinder(SpeechService speechService) {
+ this.speechService = speechService;
+ }
+
+ public SpeechService getSpeechService() {
+ return speechService;
+ }
+}
\ No newline at end of file
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/SpeechService.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/SpeechService.java
new file mode 100644
index 0000000000..20c9d65f17
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/service/SpeechService.java
@@ -0,0 +1,338 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.service;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Service;
+import android.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Color;
+import android.media.MediaPlayer;
+import android.os.Build;
+import android.os.IBinder;
+import android.support.v4.app.NotificationCompat;
+import android.util.Log;
+import android.widget.RemoteViews;
+import android.widget.Toast;
+
+import com.microsoft.bot.builder.solutions.directlinespeech.ConfigurationManager;
+import com.microsoft.bot.builder.solutions.directlinespeech.SpeechSdk;
+import com.microsoft.bot.builder.solutions.directlinespeech.model.Configuration;
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+import com.microsoft.bot.builder.solutions.virtualassistant.activities.configuration.DefaultConfiguration;
+import com.microsoft.bot.builder.solutions.virtualassistant.widgets.WidgetBotRequest;
+import com.microsoft.bot.builder.solutions.virtualassistant.widgets.WidgetBotResponse;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
+import java.io.File;
+import java.io.IOException;
+
+import client.model.BotConnectorActivity;
+import events.ActivityReceived;
+import events.Recognized;
+import events.RecognizedIntermediateResult;
+
+/**
+ * The SpeechService is the connection between bot and activities and widgets
+ * The SpeechService should always be running in the background, ready to interact with the widgets
+ * and always ready to process data immediately.
+ * Running this service as a ForegroundService best suits this requirement.
+ *
+ * NOTE: the service assumes that it has permission to RECORD_AUDIO
+ */
+public class SpeechService extends Service {
+
+ // CONSTANTS
+ private static final String TAG_FOREGROUND_SERVICE = "SpeechService";
+ public static final String ACTION_START_FOREGROUND_SERVICE = "ACTION_START_FOREGROUND_SERVICE";
+ public static final String ACTION_STOP_FOREGROUND_SERVICE = "ACTION_STOP_FOREGROUND_SERVICE";
+ public static final String ACTION_START_LISTENING = "ACTION_START_LISTENING";
+
+ // STATE
+ private IBinder binder;
+ private SpeechSdk speechSdk;
+ private ConfigurationManager configurationManager;
+ private LocationProvider locationProvider;
+
+ // CONSTRUCTOR
+ public SpeechService() {
+ binder = new ServiceBinder(this);
+ }
+
+ @Override
+ public IBinder onBind(Intent intent) {
+ return binder;
+ }
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ Log.d(TAG_FOREGROUND_SERVICE, "onCreate()");
+ EventBus.getDefault().register(this);
+
+ // set up configuration for SpeechSdk
+ configurationManager = new ConfigurationManager(this);
+
+ Configuration configuration = configurationManager.getConfiguration();
+ if (configuration.isEmpty()){
+ // set up defaults
+ configuration.serviceKey = DefaultConfiguration.COGNITIVE_SERVICES_SUBSCRIPTION_KEY;
+ configuration.botId = DefaultConfiguration.BOT_ID;
+ configuration.serviceRegion = DefaultConfiguration.SPEECH_REGION;
+ configuration.voiceName = DefaultConfiguration.VOICE_NAME;
+ configuration.directlineConstant = DefaultConfiguration.DIRECT_LINE_CONSTANT;
+ configuration.userName = DefaultConfiguration.USER_NAME;
+ configuration.userId = DefaultConfiguration.USER_ID;
+ configuration.locale = DefaultConfiguration.LOCALE;
+ configuration.geolat = DefaultConfiguration.GEOLOCATION_LAT;
+ configuration.geolon = DefaultConfiguration.GEOLOCATION_LON;
+ configuration.historyLinecount = Integer.MAX_VALUE - 1;
+ configurationManager.setConfiguration(configuration);
+ }
+
+ locationProvider = new LocationProvider(this, location -> {
+ final String locLat = String.valueOf(location.getLatitude());
+ final String locLon = String.valueOf(location.getLongitude());
+ speechSdk.sendLocationEvent(locLat, locLon);
+ });
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ EventBus.getDefault().unregister(this);
+ }
+
+ @Override
+ public int onStartCommand(Intent intent, int flags, int startId) {
+ if(intent != null) {
+ String action = intent.getAction();
+ if (action == null) action = ACTION_START_FOREGROUND_SERVICE;
+
+ switch (action) {
+ case ACTION_START_FOREGROUND_SERVICE:
+ Toast.makeText(getApplicationContext(), "Service is started", Toast.LENGTH_LONG).show();
+ startForegroundService();
+ break;
+ case ACTION_STOP_FOREGROUND_SERVICE:
+ Toast.makeText(getApplicationContext(), "Service is stopped", Toast.LENGTH_LONG).show();
+ stopForegroundService();
+ break;
+ case ACTION_START_LISTENING:
+ Toast.makeText(getApplicationContext(), "Listening", Toast.LENGTH_LONG).show();
+
+ if (speechSdk == null) initializeSpeechSdk(true);//assume true - for this to work the app must have been launched once for permission dialog
+ speechSdk.connectAsync();
+ speechSdk.listenOnceAsync();
+ break;
+ }
+ }
+ return START_STICKY;
+ }
+
+ private void startForegroundService() {
+ Log.d(TAG_FOREGROUND_SERVICE, "startForegroundService()");
+
+ // Create notification default intent
+ Intent intent = new Intent();
+ PendingIntent pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
+
+ // Create Notification Channel
+ NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+
+ String channelId = "some_channel_id";
+
+ // Starting with API level 26
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ CharSequence channelName = "Some Channel";
+ int importance = NotificationManager.IMPORTANCE_LOW;
+ NotificationChannel notificationChannel = new NotificationChannel(channelId, channelName, importance);
+ notificationChannel.enableLights(true);
+ notificationChannel.setLightColor(Color.RED);
+ notificationChannel.enableVibration(true);
+ notificationChannel.setVibrationPattern(new long[]{100, 200, 300, 400, 500, 400, 300, 200, 100});
+ notificationManager.createNotificationChannel(notificationChannel);
+ }
+
+ // Create notification builder
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(this, channelId);
+
+ // Make notification show big text
+ NotificationCompat.BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle();
+ bigTextStyle.setBigContentTitle("Speech recognitions service");
+ bigTextStyle.bigText("Speech Service is active. Click LISTEN to speak to the Bot");
+
+ // Set big text style.
+ builder.setStyle(bigTextStyle);
+
+ // Timestamp
+ builder.setWhen(System.currentTimeMillis());
+
+ // Icon
+ builder.setSmallIcon(R.mipmap.ic_launcher);
+ Bitmap largeIconBitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher);
+ builder.setLargeIcon(largeIconBitmap);
+
+ // Set notification priority
+ builder.setPriority(NotificationManager.IMPORTANCE_LOW);
+
+ // Make head-up notification
+ builder.setFullScreenIntent(pendingIntent, true);
+
+ // Add LISTEN button intent in notification
+ Intent listenIntent = new Intent(this, SpeechService.class);
+ listenIntent.setAction(ACTION_START_LISTENING);
+ PendingIntent pendingPlayIntent = PendingIntent.getService(this, 0, listenIntent, 0);
+ NotificationCompat.Action playAction = new NotificationCompat.Action(R.drawable.ic_mic, getString(R.string.service_notification_action_button), pendingPlayIntent);
+ builder.addAction(playAction);
+
+ // Build the notification
+ Notification notification = builder.build();
+
+ // Start foreground service
+ startForeground(1, notification);
+
+ startLocationUpdates();
+ }
+
+ private void stopForegroundService() {
+ Log.d(TAG_FOREGROUND_SERVICE, "stopForegroundService()");
+
+ locationProvider.stopLocationUpdates();
+
+ // Stop foreground service and remove the notification
+ stopForeground(true);
+
+ // Stop the foreground service
+ stopSelf();
+ }
+
+ public void startLocationUpdates() {
+ locationProvider.startLocationUpdates();
+ }
+
+ /**
+ * Initialize the speech SDK.
+ * Note: This can be called repeatedly without negative consequences, i.e. device rotation
+ * @param haveRecordAudioPermission true or false
+ */
+ public void initializeSpeechSdk(boolean haveRecordAudioPermission){
+ if (speechSdk != null) {
+ speechSdk.reset();
+ }
+ speechSdk = new SpeechSdk();
+ File directory = this.getFilesDir();
+ Configuration configuration = configurationManager.getConfiguration();
+ speechSdk.initialize(configuration, haveRecordAudioPermission, directory.getPath());
+ }
+
+ public SpeechSdk getSpeechSdk(){
+ if (speechSdk == null)
+ throw new IllegalStateException("initializeSpeechSdk() hasn't been called");
+ else
+ return speechSdk;
+ }
+
+
+ // EventBus: the user spoke and the app recognized intermediate speech
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onRecognizedIntermediateResultEvent(RecognizedIntermediateResult event) {
+ updateBotRequestWidget(event.recognized_speech);
+ }
+
+ // EventBus: the user spoke and the app recognized the speech. Disconnect mic.
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onRecognizedEvent(Recognized event) {
+ updateBotRequestWidget(event.recognized_speech);
+ }
+
+ // EventBus: received a response from Bot
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onActivityReceivedEvent(ActivityReceived activityReceived) throws IOException {
+ if (activityReceived.botConnectorActivity != null) {
+ BotConnectorActivity botConnectorActivity = activityReceived.botConnectorActivity;
+
+ String amount;
+
+ switch (botConnectorActivity.getType()) {
+ case "message":
+ updateBotResponseWidget(botConnectorActivity.getText());
+ break;
+ case "dialogState":
+ Log.i(TAG_FOREGROUND_SERVICE, "Activity with DialogState");
+ break;
+ case "PlayLocalFile":
+ Log.i(TAG_FOREGROUND_SERVICE, "Activity with PlayLocalFile");
+ playMediaStream(botConnectorActivity.getFile());
+ break;
+ case "AbsoluteTemp": {
+ // "set the cabin temp to 75F"
+ amount = botConnectorActivity.getAmount();//amount is absolute temp
+ Log.i(TAG_FOREGROUND_SERVICE, "Activity with AbsoluteTemp to "+ amount);
+ break;
+ }
+ case "DecreaseTemp": {
+ amount = botConnectorActivity.getAmount();
+ Log.i(TAG_FOREGROUND_SERVICE, "Activity with DecreaseTemp by " + amount);
+ break;
+ }
+ case "IncreaseTemp": {
+ amount = botConnectorActivity.getAmount();
+ Log.i(TAG_FOREGROUND_SERVICE, "Activity with IncreaseTemp by " + amount);
+ break;
+ }
+ default:
+ break;
+ }
+ }
+ }
+
+ private void playMediaStream(String mediaStream) {
+ try {
+ MediaPlayer mediaPlayer = new MediaPlayer();
+ mediaPlayer.setDataSource(mediaStream);
+ mediaPlayer.prepare();
+ mediaPlayer.start();
+ }
+ catch(IOException e) {
+ Log.e(TAG_FOREGROUND_SERVICE, "IOexception " + e.getMessage());
+ }
+
+ }
+
+ private void updateBotResponseWidget(String text){
+ Log.v(TAG_FOREGROUND_SERVICE, "updateBotResponseWidget("+text+")");
+ Context context = this;
+ AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+ RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget_bot_response);
+ ComponentName thisWidget = new ComponentName(context, WidgetBotResponse.class);
+ remoteViews.setTextViewText(R.id.appwidget_text, text);
+ appWidgetManager.updateAppWidget(thisWidget, remoteViews);
+ }
+
+ private void updateBotRequestWidget(String text){
+ Log.v(TAG_FOREGROUND_SERVICE, "updateBotRequestWidget("+text+")");
+ Context context = this;
+ AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
+ RemoteViews remoteViews = new RemoteViews(context.getPackageName(), R.layout.widget_bot_request);
+ ComponentName thisWidget = new ComponentName(context, WidgetBotRequest.class);
+ remoteViews.setTextViewText(R.id.appwidget_text, text);
+ appWidgetManager.updateAppWidget(thisWidget, remoteViews);
+ }
+
+ public Configuration getConfiguration(){
+ return configurationManager.getConfiguration();
+ }
+
+ public void setConfiguration(Configuration configuration){
+ configurationManager.setConfiguration(configuration);
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/utils/RawUtils.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/utils/RawUtils.java
new file mode 100644
index 0000000000..5039ceaf64
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/utils/RawUtils.java
@@ -0,0 +1,30 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.utils;
+
+import android.content.Context;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Collection of utilities to interact with res/raw
+ */
+public class RawUtils {
+
+ public static String loadHostConfig(Context context) {
+ String json = null;
+ try {
+ InputStream is = context.getResources().openRawResource(R.raw.hostconfig);
+ int size = is.available();
+ byte[] buffer = new byte[size];
+ is.read(buffer);
+ is.close();
+ json = new String(buffer, "UTF-8");
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ return null;
+ }
+ return json;
+ }
+}
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetBotRequest.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetBotRequest.java
new file mode 100644
index 0000000000..95ae629a7d
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetBotRequest.java
@@ -0,0 +1,41 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.widgets;
+
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.widget.RemoteViews;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+
+/**
+ * Implementation of App Widget functionality.
+ */
+public class WidgetBotRequest extends AppWidgetProvider {
+
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ // There may be multiple widgets active, so update all of them
+ for (int appWidgetId : appWidgetIds) {
+
+ CharSequence widgetText = "";
+
+ // Construct the RemoteViews object
+ RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_bot_request);
+ views.setTextViewText(R.id.appwidget_text, widgetText);
+
+ // Instruct the widget manager to update the widget
+ appWidgetManager.updateAppWidget(appWidgetId, views);
+ }
+ }
+
+ @Override
+ public void onEnabled(Context context) {
+ // Enter relevant functionality for when the first widget is created
+ }
+
+ @Override
+ public void onDisabled(Context context) {
+ // Enter relevant functionality for when the last widget is disabled
+ }
+}
+
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetBotResponse.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetBotResponse.java
new file mode 100644
index 0000000000..7894a6d1ca
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetBotResponse.java
@@ -0,0 +1,41 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.widgets;
+
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.widget.RemoteViews;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+
+/**
+ * Implementation of App Widget functionality.
+ */
+public class WidgetBotResponse extends AppWidgetProvider {
+
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ // There may be multiple widgets active, so update all of them
+ for (int appWidgetId : appWidgetIds) {
+
+ CharSequence widgetText = "";
+
+ // Construct the RemoteViews object
+ RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_bot_response);
+ views.setTextViewText(R.id.appwidget_text, widgetText);
+
+ // Instruct the widget manager to update the widget
+ appWidgetManager.updateAppWidget(appWidgetId, views);
+ }
+ }
+
+ @Override
+ public void onEnabled(Context context) {
+ // Enter relevant functionality for when the first widget is created
+ }
+
+ @Override
+ public void onDisabled(Context context) {
+ // Enter relevant functionality for when the last widget is disabled
+ }
+}
+
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetTalkButton.java b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetTalkButton.java
new file mode 100644
index 0000000000..7429f9a7de
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/java/com/microsoft/bot/builder/solutions/virtualassistant/widgets/WidgetTalkButton.java
@@ -0,0 +1,58 @@
+package com.microsoft.bot.builder.solutions.virtualassistant.widgets;
+
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+import android.widget.RemoteViews;
+
+import com.microsoft.bot.builder.solutions.virtualassistant.R;
+import com.microsoft.bot.builder.solutions.virtualassistant.service.SpeechService;
+
+import static com.microsoft.bot.builder.solutions.virtualassistant.service.SpeechService.ACTION_START_LISTENING;
+
+/**
+ * Implementation of App Widget functionality.
+ * This Widget launches an activity to record audio
+ */
+public class WidgetTalkButton extends AppWidgetProvider {
+
+ public static int WIDGET_LAYOUT = R.layout.widget_talk_button;
+
+ /**
+ * Updates all the widgets
+ * @param context Context
+ * @param appWidgetManager Widget Manager
+ * @param appWidgetIds Widget IDs
+ */
+ @Override
+ public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+ Log.d("sender", "Broadcasting message");
+ for (int appWidgetId : appWidgetIds) {
+ RemoteViews remoteView = new RemoteViews(context.getPackageName(), WIDGET_LAYOUT);
+ remoteView.setOnClickPendingIntent(R.id.push_to_talk, getPendingSelfIntent(context, appWidgetId));
+ appWidgetManager.updateAppWidget(appWidgetId, remoteView);
+ }
+
+ }
+
+ protected PendingIntent getPendingSelfIntent(Context context, int widgetId) {
+ Intent intent = new Intent(context, SpeechService.class);
+ intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, widgetId);
+ intent.setAction(ACTION_START_LISTENING);
+ return PendingIntent.getService(context, 0, intent, 0);
+ }
+
+ @Override
+ public void onEnabled(Context context) {
+ // Enter relevant functionality for when the first widget is created
+ }
+
+ @Override
+ public void onDisabled(Context context) {
+ // Enter relevant functionality for when the last widget is disabled
+ }
+}
+
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-anydpi/ic_debug.xml b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-anydpi/ic_debug.xml
new file mode 100644
index 0000000000..eb3f0ab021
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-anydpi/ic_debug.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-anydpi/ic_welcome.xml b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-anydpi/ic_welcome.xml
new file mode 100644
index 0000000000..c62645a9ed
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-anydpi/ic_welcome.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_debug.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_debug.png
new file mode 100644
index 0000000000..2f72ec4296
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_debug.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_gps.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_gps.png
new file mode 100644
index 0000000000..fce33da937
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_gps.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_welcome.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_welcome.png
new file mode 100644
index 0000000000..be1802040a
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-hdpi/ic_welcome.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_debug.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_debug.png
new file mode 100644
index 0000000000..871ecdabd8
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_debug.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_gps.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_gps.png
new file mode 100644
index 0000000000..8c324083e6
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_gps.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_welcome.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_welcome.png
new file mode 100644
index 0000000000..55982e555d
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-mdpi/ic_welcome.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_pushtalk.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_pushtalk.png
new file mode 100644
index 0000000000..2434d7dcaf
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_pushtalk.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_request.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_request.png
new file mode 100644
index 0000000000..39bd9cbade
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_request.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_response.png b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_response.png
new file mode 100644
index 0000000000..080b2775f0
Binary files /dev/null and b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-nodpi/widget_preview_response.png differ
diff --git a/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 0000000000..1f6bb29060
--- /dev/null
+++ b/solutions/android/VirtualAssistantClient/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,34 @@
+
+
+
+
+