Got the 'install watch appp' function working to install the watch app from the phone app package.

This commit is contained in:
Graham Jones
2016-05-09 21:01:38 +01:00
parent cacbb04969
commit acb29fe72e
3 changed files with 3 additions and 35 deletions

View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Android_Pebble_SD" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@@ -104,9 +104,7 @@ public class StartupActivity extends Activity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Log.v(TAG, "pebble button clicked"); Log.v(TAG, "pebble button clicked");
mUtil.showToast("pebble button clicked"); mUtil.startPebbleApp();
//mUtil.startPebbleApp();
mConnection.mSdServer.mSdDataSource.installWatchApp();
} }
}); });
@@ -115,7 +113,8 @@ public class StartupActivity extends Activity {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
Log.v(TAG, "install Osd Watch App button clicked"); Log.v(TAG, "install Osd Watch App button clicked");
mUtil.installOsdWatchApp(); //mUtil.installOsdWatchApp();
mConnection.mSdServer.mSdDataSource.installWatchApp();
} }
}); });

View File

@@ -1,12 +0,0 @@
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Tue May 03 19:40:01 BST 2016
ndk.dir=/usr/local/android-sdk-linux/ndk-bundle
sdk.dir=/usr/local/android-sdk-linux