Merge pull request #237 from Adobe-Marketing-Cloud/wear

Update Android Sample Apps

samples/Android/ADBMobileSamples/app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.adobe.adbmobilesamples"

samples/Android/ADBMobileSamples/app/src/main/AndroidManifest.xml

@@ -30,6 +30,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".target.TargetingLocationActivity" android:screenOrientation="portrait" />
+        <activity android:name=".target.TargetPrefetchActivity" android:screenOrientation="portrait" />
         <activity android:name=".analytics.SimpleTrackingActivity" android:screenOrientation="portrait" />
         <activity android:name=".gallery.GalleryActivity" android:screenOrientation="portrait" />
         <activity android:name=".analytics.TimedActionsActivity" android:screenOrientation="portrait" />
@@ -41,23 +42,6 @@
         <activity android:name=".messaging.InAppMessagingActivity" android:label="In-App Messages"/>
         <activity android:name="com.adobe.mobile.MessageFullScreenActivity" android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
-        <!--<activity android:name=".deeplinks.ParseDeepLinkActivity">-->
-            <!--<intent-filter>-->
-                <!--<action android:name="android.intent.action.VIEW" />-->
-                <!--<category android:name="android.intent.category.DEFAULT" />-->
-                <!--<category android:name="android.intent.category.BROWSABLE" />-->
-                <!--&lt;!&ndash; Accepts URIs that begin with "http://www.example.com/gizmos” &ndash;&gt;-->
-                <!--<data android:scheme="http"-->
-                    <!--android:host="www.example.com"-->
-                    <!--android:pathPrefix="/gizmos" />-->
-                <!--&lt;!&ndash; note that the leading "/" is required for pathPrefix&ndash;&gt;-->
-                <!--&lt;!&ndash; Accepts URIs that begin with "example://gizmos” &ndash;&gt;-->
-                <!--<data android:scheme="com.adobe.example"-->
-                    <!--android:host="gizmos" />-->
-
-            <!--</intent-filter>-->
-        <!--</activity>-->
-
         <!--<activity android:name="deeplinks.ParseDeepLinkActivity">-->
             <!--<intent-filter>-->
                 <!--<action android:name="android.intent.action.VIEW"/>-->

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/MenuActivity.java

@@ -21,7 +21,6 @@
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.view.Window;
 import android.widget.Toast;
@@ -34,11 +33,11 @@
 import com.adobe.adbmobilesamples.messaging.InAppMessagingActivity;
 import com.adobe.adbmobilesamples.messaging.RegistrationIntentService;
 import com.adobe.adbmobilesamples.postbacks.PostbackActivity;
+import com.adobe.adbmobilesamples.target.TargetPrefetchActivity;
 import com.adobe.adbmobilesamples.target.TargetingLocationActivity;
 import com.adobe.mobile.*;
 
 import java.io.*;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -183,6 +182,11 @@ public void targetingLocations(View view) {
 		startActivity(targetingIntent);
 	}
 
+	public void targetPrefetch(View view) {
+		Intent prefetchIntent = new Intent(this, TargetPrefetchActivity.class);
+		startActivity(prefetchIntent);
+	}
+
     public void lifetimeValue(View view) {
         Intent lifetimeValueIntent = new Intent(this, LifetimeValueActivity.class);
         startActivity(lifetimeValueIntent);

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/PrivacyActivity.java

@@ -26,10 +26,13 @@
 public class PrivacyActivity extends Activity {
 	private MobilePrivacyStatus currentStatus;
 
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.privacy_example);
+
+		Config.setContext(this.getApplicationContext());
 	}
 
 	@Override
@@ -108,4 +111,4 @@ public void trackActionPrivacy(View view) {
 		 */
 		Analytics.trackAction("privacyStatusCheck", null);
 	}
-}
+}

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/LifetimeValueActivity.java

@@ -32,6 +32,7 @@ public class LifetimeValueActivity extends Activity {
 	private TextView _lblText;
 	private LinearLayout _layout;
 
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -40,6 +41,8 @@ public void onCreate(Bundle savedInstanceState) {
 		_lblText = (TextView)findViewById(R.id.lblLifetimeValueText);
 		_layout = (LinearLayout)findViewById(R.id.layoutLifetimeValue);
         updateLTVLabel();
+
+		Config.setContext(this.getApplicationContext());
 	}
 
 	@Override
@@ -150,4 +153,4 @@ private void updateLTVLabel() {
 	     */
         ltvLabel.setText(String.format("%.02f", Config.getLifetimeValue()));
     }
-}
+}

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/MediaActivity.java

@@ -27,6 +27,7 @@ public class MediaActivity extends Activity {
 	private ToggleButton _toggleTrackMilestones, _toggleSegmentMilestones, _toggleTrackOffsetMilestones,
 			_toggleSegmentOffsetMilestones, _toggleTrackEvery30;
 
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -40,6 +41,8 @@ public void onCreate(Bundle savedInstanceState) {
 
 		_toggleTrackMilestones.setChecked(true);
 		_toggleSegmentMilestones.setChecked(true);
+
+		Config.setContext(this.getApplicationContext());
 	}
 
 	@Override
@@ -146,4 +149,4 @@ else if (_toggleTrackEvery30.isChecked()) {
 
 		startActivity(videoPlayerIntent);
 	}
-}
+}

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/SimpleTrackingActivity.java

@@ -26,10 +26,13 @@
 import java.util.HashMap;
 
 public class SimpleTrackingActivity extends Activity {
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.simple_tracking);
+
+		Config.setContext(this.getApplicationContext());
 	}
 
 	@Override
@@ -105,4 +108,4 @@ public void trackAction(View view) {
 		 */
 		Analytics.trackAction("trackAction:data: button pushed", contextData);
 	}
-}
+}

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/TimedActionsActivity.java

@@ -26,10 +26,13 @@
 import java.util.Map;
 
 public class TimedActionsActivity extends Activity {
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.timed_actions);
+
+		Config.setContext(this.getApplicationContext());
 	}
 
 	@Override
@@ -134,4 +137,4 @@ public void run() {
 			}
 		});
 	}
-}
+}

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/analytics/VideoPlayerActivity.java

@@ -31,11 +31,14 @@ public class VideoPlayerActivity extends Activity {
 	private static final String PLAYER_ID = "VideoView1";
 	private static final double MEDIA_LENGTH = 146;
 
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.video_player);
 
+		Config.setContext(this.getApplicationContext());
+
 		/*
 		 * Adobe Tracking - Media
 		 *
@@ -142,4 +145,4 @@ protected void onResume() {
 		 */
 		Config.collectLifecycleData();
 	}
-}
+}

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/deeplinks/ParseDeepLinkActivity.java

@@ -39,6 +39,7 @@ public class ParseDeepLinkActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+	    Config.setContext(this.getApplicationContext());
         Config.collectLifecycleData(this);
 
         Intent intent = getIntent();

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/gallery/GalleryActivity.java

@@ -69,11 +69,14 @@ public boolean onPreDraw() {
 		}
 	};
 
+	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		this.requestWindowFeature(Window.FEATURE_NO_TITLE);
 		setContentView(R.layout.gallery);
 
+		Config.setContext(this.getApplicationContext());
+
 		_progressBar = (ProgressBar)findViewById(R.id.progressBar);
 
 		// get a reference for the potential promo banner

samples/Android/ADBMobileSamples/app/src/main/java/com/adobe/adbmobilesamples/messaging/InAppMessagingActivity.java

@@ -32,6 +32,8 @@ public class InAppMessagingActivity extends Activity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.in_app_messages);
+
+	    Config.setContext(this.getApplicationContext());
     }
 
     @Override
@@ -94,4 +96,4 @@ public void showLocalNotification(View view) {
         exampleContextData.put("local", "notification");
         Analytics.trackAction("local notification sample", exampleContextData);
     }
-}
+}