Merge "Don't set the theme on the Confirm Recovery Email screen since it is a dialog. Also removes a deleted entry from the manifest"

Author: Aaron Mandle

auth/src/main/AndroidManifest.xml

@@ -29,9 +29,6 @@
         <activity android:theme="@style/FirebaseUI.Translucent"
                   android:name="com.firebase.ui.auth.ui.idp.IDPSignInContainerActivity" >
         </activity>
-        <activity android:theme="@style/FirebaseUI.Translucent"
-                  android:name="com.firebase.ui.auth.ui.credentials.CredentialsInitActivity" >
-        </activity>
         <activity android:theme="@style/FirebaseUI.Translucent"
                    android:name="com.firebase.ui.auth.ui.credentials.ChooseAccountActivity" >
         </activity>

auth/src/main/java/com/firebase/ui/auth/ui/email/ConfirmRecoverPasswordActivity.java

@@ -26,11 +26,16 @@
 import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 
-public class ConfirmRecoverPasswordActivity extends AppCompatBase implements View.OnClickListener {
+public class ConfirmRecoverPasswordActivity extends android.support.v7.app.AppCompatActivity
+        implements View.OnClickListener {
+    private ActivityHelper mActivityHelper;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mActivityHelper = new ActivityHelper(this, getIntent());
+        // intentionally do not configure the theme on this activity, it is a dialog
+
         setContentView(R.layout.confirm_recovery_layout);
         setTitle(R.string.check_your_email);
         String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
@@ -65,4 +70,8 @@ public static Intent createIntent(
                 .putExtra(ExtraConstants.EXTRA_SUCCESS, success)
                 .putExtra(ExtraConstants.EXTRA_EMAIL, email);
     }
+
+    private void finish(int resultCode, Intent intent) {
+        mActivityHelper.finish(resultCode, intent);
+    }
 }