Commit 335b9e2c authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[Android] Fix PassphraseActivity backstack check and base class

PassphraseActivity was broken by https://crrev.com/c/1708895, as it was
checking for backstack entry count in the framework FragmentManager,
while fragments were added to FragmentManager from the support library.
This is fixed by using getSupportFragmentManager.
A second unrelated fix is a change of the base class from
FragmentActivity to AppCompatActivity. All Chrome activities should
inherit AppCompatActivity to make sure proper view classes from support
library are inflated.

Bug: 998412
Change-Id: I286544233c18f4bf0289cee7e3c7aa2618a76b54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1768350
Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#691525}
parent f46bbd25
......@@ -9,9 +9,9 @@ import android.app.Dialog;
import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import org.chromium.base.library_loader.ProcessInitException;
......@@ -26,10 +26,8 @@ import org.chromium.components.signin.ChromeSigninController;
* This activity is used for requesting a sync passphrase from the user. Typically,
* this will be the target of an Android notification.
*/
public class PassphraseActivity extends FragmentActivity implements
PassphraseDialogFragment.Listener,
FragmentManager.OnBackStackChangedListener {
public class PassphraseActivity extends AppCompatActivity
implements PassphraseDialogFragment.Listener, FragmentManager.OnBackStackChangedListener {
public static final String FRAGMENT_PASSPHRASE = "passphrase_fragment";
public static final String FRAGMENT_SPINNER = "spinner_fragment";
private static final String TAG = "PassphraseActivity";
......@@ -144,7 +142,7 @@ public class PassphraseActivity extends FragmentActivity implements
@Override
public void onBackStackChanged() {
if (getFragmentManager().getBackStackEntryCount() == 0) {
if (getSupportFragmentManager().getBackStackEntryCount() == 0) {
finish();
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment