Settings Fragment Migration (Build pass app)
This patch focused on fixing compile errors and some runtime errors. Test: We can't test it now. But we will have an integration test later. Bug: 110259478 Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
@@ -16,7 +16,6 @@
|
||||
|
||||
package com.android.settings.backup;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
@@ -34,6 +33,7 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
import androidx.fragment.app.FragmentManager;
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ import androidx.fragment.app.FragmentManager;
|
||||
* if the manufacturer provided their backup settings.
|
||||
*/
|
||||
@SearchIndexable
|
||||
public class BackupSettingsActivity extends Activity implements Indexable {
|
||||
public class BackupSettingsActivity extends FragmentActivity implements Indexable {
|
||||
private static final String TAG = "BackupSettingsActivity";
|
||||
private FragmentManager mFragmentManager;
|
||||
|
||||
@@ -81,7 +81,7 @@ public class BackupSettingsActivity extends Activity implements Indexable {
|
||||
}
|
||||
// mFragmentManager can be set by {@link #setFragmentManager()} for testing
|
||||
if (mFragmentManager == null) {
|
||||
mFragmentManager = getFragmentManager();
|
||||
mFragmentManager = getSupportFragmentManager();
|
||||
}
|
||||
mFragmentManager.beginTransaction()
|
||||
.replace(android.R.id.content, new BackupSettingsFragment())
|
||||
|
Reference in New Issue
Block a user