CR fix

Author: josefhruska

auth/src/main/AndroidManifest.xml

@@ -32,6 +32,7 @@
         <activity
             android:name=".ui.email.RecoverPasswordActivity"
             android:label="@string/title_recover_password_activity"
+            android:windowSoftInputMode="adjustResize|stateAlwaysVisible"
             android:exported="false"/>
 
         <activity

auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackIdpPrompt.java

@@ -74,6 +74,7 @@ public static Intent createIntent(
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.welcome_back_idp_prompt_layout);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         IdpResponse newUserIdpResponse = IdpResponse.fromResultIntent(getIntent());
         mPrevCredential = AuthCredentialHelper.getAuthCredential(newUserIdpResponse);

auth/src/main/java/com/firebase/ui/auth/ui/accountlink/WelcomeBackPasswordPrompt.java

@@ -79,6 +79,7 @@ public static Intent createIntent(
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.welcome_back_password_prompt_layout);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         // Show keyboard
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);

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

@@ -20,8 +20,11 @@
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
 import android.support.design.widget.TextInputLayout;
+import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
+import android.widget.TextView;
 
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ui.AppCompatBase;
@@ -53,10 +56,22 @@ public static Intent createIntent(Context context, FlowParameters flowParams, St
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.forgot_password_layout);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         mEmailFieldValidator =
                 new EmailFieldValidator((TextInputLayout) findViewById(R.id.email_layout));
         mEmailEditText = (EditText) findViewById(R.id.email);
+        mEmailEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    onClick(findViewById(R.id.button_done));
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        });
 
         String email = getIntent().getStringExtra(ExtraConstants.EXTRA_EMAIL);
         if (email != null) {

auth/src/main/res/layout/forgot_password_layout.xml

@@ -11,7 +11,11 @@
         style="@style/FirebaseUI.Text.BodyText"
         android:text="@string/password_recovery_body"
         android:paddingLeft="32dp"
-        android:paddingRight="32dp"/>
+        android:paddingRight="32dp"
+        android:textColor="@color/gray_3"
+        android:gravity="center"
+        android:textSize="16sp"
+        android:lineSpacingExtra="5sp"/>
 
     <android.support.design.widget.TextInputLayout
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -28,21 +32,16 @@
 
         <android.support.design.widget.TextInputEditText
             style="@style/FirebaseUI.EditText.EmailField"
-            android:id="@+id/email"/>
+            android:id="@+id/email"
+            android:imeOptions="actionDone"/>
 
     </android.support.design.widget.TextInputLayout>
 
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:gravity="end"
-        android:paddingTop="194dp">
-
-        <Button
-            style="@style/FirebaseUI.FullWidthButtonSettleUp"
-            android:id="@+id/button_done"
-            android:text="@string/button_text_send"/>
-
-    </LinearLayout>
+    <Button
+        style="@style/FirebaseUI.FullWidthButtonSettleUp"
+        android:id="@+id/button_done"
+        android:text="@string/button_text_send"
+        android:background="@color/authui_colorAccent"
+        android:layout_alignParentBottom="true"/>
 
 </RelativeLayout>

auth/src/main/res/values/strings.xml

@@ -58,7 +58,7 @@
     <string name="trouble_signing_in">Trouble signing in?</string>
 
     <!-- Password recovery -->
-    <string name="title_recover_password_activity">Recover password</string>
+    <string name="title_recover_password_activity">Forgotten password</string>
     <string name="title_confirm_recover_password">Check your email</string>
     <string name="password_recovery_body">Get instructions sent to this email that explain how to
         reset your password.</string>