Bug 986096 - On access to Sync through settings after setup, user should be sent to config screen not 'back to browsing'. r=nalexander

mobile/android/base/fxa/activities/FxAccountConfirmAccountActivity.java

@@ -19,6 +19,7 @@ import org.mozilla.gecko.fxa.login.State;
 import org.mozilla.gecko.fxa.login.State.StateLabel;
 import org.mozilla.gecko.sync.setup.activities.ActivityUtils;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
@@ -63,6 +64,8 @@ public class FxAccountConfirmAccountActivity extends FxAccountAbstractActivity i
       @Override
       public void onClick(View v) {
         ActivityUtils.openURLInFennec(v.getContext(), null);
+        setResult(Activity.RESULT_OK);
+        finish();
       }
     });
   }

mobile/android/services/manifests/FxAccountAndroidManifest_activities.xml.in

@@ -37,6 +37,7 @@
         <activity
             android:theme="@style/FxAccountTheme"
             android:name="org.mozilla.gecko.fxa.activities.FxAccountConfirmAccountActivity"
+            android:noHistory="true"
             android:windowSoftInputMode="adjustResize">
         </activity>
 
@@ -49,6 +50,7 @@
         <activity
             android:theme="@style/FxAccountTheme"
             android:name="org.mozilla.gecko.fxa.activities.FxAccountVerifiedAccountActivity"
+            android:noHistory="true"
             android:windowSoftInputMode="adjustResize">
         </activity>
 
@@ -61,5 +63,6 @@
         <activity
             android:theme="@style/FxAccountTheme"
             android:name="org.mozilla.gecko.fxa.activities.FxAccountCreateAccountNotAllowedActivity"
+            android:noHistory="true"
             android:windowSoftInputMode="adjustResize">
         </activity>