Continue to migrate Activtiy/Fragment to androidx.
Bug: 176975115
Bug: 174691340
Test: Manual
Change-Id: I2a32bf0b3a4dfbdf09f9b925e91f72142aa33cf7
diff --git a/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java b/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java
index 8ae2823..7ec13c2 100644
--- a/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java
+++ b/Settings/src/com/android/tv/settings/ActionDisabledByAdminDialog.java
@@ -16,17 +16,18 @@
package com.android.tv.settings;
-import android.app.Activity;
import android.app.admin.DevicePolicyManager;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-public class ActionDisabledByAdminDialog extends Activity
+public class ActionDisabledByAdminDialog extends FragmentActivity
implements DialogInterface.OnDismissListener {
private ActionDisabledByAdminDialogHelper mDialogHelper;
diff --git a/Settings/src/com/android/tv/settings/EmptyStubActivity.java b/Settings/src/com/android/tv/settings/EmptyStubActivity.java
index ce6a699..6ce3915 100644
--- a/Settings/src/com/android/tv/settings/EmptyStubActivity.java
+++ b/Settings/src/com/android/tv/settings/EmptyStubActivity.java
@@ -17,10 +17,11 @@
package com.android.tv.settings;
import android.annotation.Nullable;
-import android.app.Activity;
import android.os.Bundle;
-public class EmptyStubActivity extends Activity {
+import androidx.fragment.app.FragmentActivity;
+
+public class EmptyStubActivity extends FragmentActivity {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/Settings/src/com/android/tv/settings/about/LicenseActivity.java b/Settings/src/com/android/tv/settings/about/LicenseActivity.java
index 1cc5419..9f63d52 100644
--- a/Settings/src/com/android/tv/settings/about/LicenseActivity.java
+++ b/Settings/src/com/android/tv/settings/about/LicenseActivity.java
@@ -16,7 +16,6 @@
package com.android.tv.settings.about;
-import android.app.Activity;
import android.app.LoaderManager;
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
@@ -30,6 +29,7 @@
import androidx.annotation.VisibleForTesting;
import androidx.core.content.FileProvider;
+import androidx.fragment.app.FragmentActivity;
import com.android.settingslib.license.LicenseHtmlLoader;
import com.android.tv.settings.R;
@@ -39,7 +39,7 @@
/**
* Displays open source NOTICE files.
*/
-public class LicenseActivity extends Activity implements
+public class LicenseActivity extends FragmentActivity implements
LoaderManager.LoaderCallbacks<File> {
private static final String TAG = "LicenseActivity";
private static final String FILE_PROVIDER_AUTHORITY = "com.android.settings.files";
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
index d51fc08..b8b1e2c 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryActivity.java
@@ -16,8 +16,6 @@
package com.android.tv.settings.accessories;
-import android.app.Activity;
-import android.app.FragmentManager;
import android.bluetooth.BluetoothDevice;
import android.content.Intent;
import android.hardware.hdmi.HdmiControlManager;
@@ -35,6 +33,8 @@
import android.view.WindowManager;
import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
import com.android.tv.settings.R;
@@ -45,7 +45,8 @@
/**
* Activity for detecting and adding (pairing) new bluetooth devices.
*/
-public class AddAccessoryActivity extends Activity implements BluetoothDevicePairer.EventListener {
+public class AddAccessoryActivity extends FragmentActivity
+ implements BluetoothDevicePairer.EventListener {
private static final boolean DEBUG = false;
private static final String TAG = "AddAccessoryActivity";
@@ -209,7 +210,7 @@
savedInstanceState.getParcelableArrayList(SAVED_STATE_BLUETOOTH_DEVICES);
}
- final FragmentManager fm = getFragmentManager();
+ final FragmentManager fm = getSupportFragmentManager();
if (savedInstanceState == null) {
mPreferenceFragment = AddAccessoryPreferenceFragment.newInstance();
mContentFragment = AddAccessoryContentFragment.newInstance();
@@ -239,9 +240,9 @@
@Override
protected void onSaveInstanceState(@NonNull Bundle outState) {
super.onSaveInstanceState(outState);
- getFragmentManager().putFragment(outState,
+ getSupportFragmentManager().putFragment(outState,
SAVED_STATE_PREFERENCE_FRAGMENT, mPreferenceFragment);
- getFragmentManager().putFragment(outState,
+ getSupportFragmentManager().putFragment(outState,
SAVED_STATE_CONTENT_FRAGMENT, mContentFragment);
outState.putParcelableList(SAVED_STATE_BLUETOOTH_DEVICES, mBluetoothDevices);
}
diff --git a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
index 34ac0f0..3bde6ff 100644
--- a/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
+++ b/Settings/src/com/android/tv/settings/accessories/AddAccessoryPreferenceFragment.java
@@ -30,7 +30,7 @@
import android.util.SparseArray;
import androidx.annotation.NonNull;
-import androidx.leanback.preference.BaseLeanbackPreferenceFragment;
+import androidx.leanback.preference.BaseLeanbackPreferenceFragmentCompat;
import androidx.leanback.widget.VerticalGridView;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
@@ -48,7 +48,7 @@
/**
* The screen in TV settings that shows when bluetooth searching/pairing is active.
*/
-public class AddAccessoryPreferenceFragment extends BaseLeanbackPreferenceFragment implements
+public class AddAccessoryPreferenceFragment extends BaseLeanbackPreferenceFragmentCompat implements
LifecycleOwner, Instrumentable {
private SparseArray<Drawable> mResizedDrawables = new SparseArray<>();
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothDevicePickerActivity.java b/Settings/src/com/android/tv/settings/accessories/BluetoothDevicePickerActivity.java
index 0d04ccb..163ed5f 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothDevicePickerActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothDevicePickerActivity.java
@@ -16,15 +16,16 @@
package com.android.tv.settings.accessories;
-import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.tv.settings.R;
-public class BluetoothDevicePickerActivity extends Activity {
+public class BluetoothDevicePickerActivity extends FragmentActivity {
public static final String TAG = "BtDevicePickerActivity";
private static final boolean DEBUG = false;
diff --git a/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java b/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java
index 8193123..1a0303d 100644
--- a/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java
+++ b/Settings/src/com/android/tv/settings/accessories/BluetoothRequestPermissionActivity.java
@@ -23,8 +23,9 @@
import android.util.Log;
import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
-public class BluetoothRequestPermissionActivity extends Activity {
+public class BluetoothRequestPermissionActivity extends FragmentActivity {
private static final String TAG = "BluetoothRequestPermissionActivity";
diff --git a/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java b/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
index a608bc4..6265bbc 100644
--- a/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
+++ b/Settings/src/com/android/tv/settings/accounts/AddAccountWithTypeActivity.java
@@ -27,10 +27,12 @@
import android.provider.Settings;
import android.util.Log;
+import androidx.fragment.app.FragmentActivity;
+
import java.io.IOException;
-public class AddAccountWithTypeActivity extends Activity {
+public class AddAccountWithTypeActivity extends FragmentActivity {
// Must match com.google.android.gms.common.AccountPicker.
public static final String EXTRA_ALLOWABLE_ACCOUNT_TYPES_STRING_ARRAY = "allowableAccountTypes";
diff --git a/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java b/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java
index ed9d2d0..472d2a1 100644
--- a/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java
+++ b/Settings/src/com/android/tv/settings/accounts/RemoveAccountDialog.java
@@ -22,7 +22,6 @@
import android.accounts.AccountManagerFuture;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
-import android.app.Activity;
import android.app.ActivityManager;
import android.os.Bundle;
import android.os.Handler;
@@ -30,7 +29,8 @@
import android.widget.Toast;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -42,7 +42,8 @@
/**
* OK / Cancel dialog.
*/
-public class RemoveAccountDialog extends Activity implements AccountManagerCallback<Bundle> {
+public class RemoveAccountDialog extends FragmentActivity
+ implements AccountManagerCallback<Bundle> {
private static final String TAG = "RemoveAccountDialog";
@@ -50,7 +51,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState == null) {
- GuidedStepFragment.addAsRoot(this, RemoveAccountFragment.newInstance(
+ GuidedStepSupportFragment.addAsRoot(this, RemoveAccountFragment.newInstance(
getIntent().getStringExtra(AccountSyncActivity.EXTRA_ACCOUNT)),
android.R.id.content);
}
@@ -77,7 +78,7 @@
finish();
}
- public static class RemoveAccountFragment extends GuidedStepFragment {
+ public static class RemoveAccountFragment extends GuidedStepSupportFragment {
private static final String ARG_ACCOUNT_NAME = "accountName";
private static final int ID_OK = 1;
private static final int ID_CANCEL = 0;
diff --git a/Settings/src/com/android/tv/settings/autofill/AutofillPickerTrampolineActivity.java b/Settings/src/com/android/tv/settings/autofill/AutofillPickerTrampolineActivity.java
index 6445638..dc5df9a 100644
--- a/Settings/src/com/android/tv/settings/autofill/AutofillPickerTrampolineActivity.java
+++ b/Settings/src/com/android/tv/settings/autofill/AutofillPickerTrampolineActivity.java
@@ -15,12 +15,13 @@
*/
package com.android.tv.settings.autofill;
-import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
import android.os.Bundle;
import android.view.autofill.AutofillManager;
+import androidx.fragment.app.FragmentActivity;
+
/**
* Standalone activity used to launch a {@link AutofillPickerActivity" from a
* {@link android.provider.Settings#ACTION_REQUEST_SET_AUTOFILL_SERVICE} intent.
@@ -28,7 +29,7 @@
* <p>It first checks for cases that can fail fast, then forwards to {@link AutofillPickerActivity}
* if necessary.
*/
-public class AutofillPickerTrampolineActivity extends Activity {
+public class AutofillPickerTrampolineActivity extends FragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
diff --git a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
index a5468ed..a618ab4 100644
--- a/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
+++ b/Settings/src/com/android/tv/settings/connectivity/WifiDetailsFragment.java
@@ -29,7 +29,7 @@
import android.text.TextUtils;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
import androidx.preference.ListPreference;
@@ -267,7 +267,7 @@
return TvSettingsEnums.NETWORK_AP_INFO;
}
- public static class ForgetNetworkConfirmFragment extends GuidedStepFragment {
+ public static class ForgetNetworkConfirmFragment extends GuidedStepSupportFragment {
private AccessPoint mAccessPoint;
private final MetricsFeatureProvider mMetricsFeatureProvider = new MetricsFeatureProvider();
diff --git a/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java b/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
index 4c9ff1e..47c7bb6 100644
--- a/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
+++ b/Settings/src/com/android/tv/settings/device/apps/MoveAppActivity.java
@@ -17,8 +17,6 @@
package com.android.tv.settings.device.apps;
import android.annotation.Nullable;
-import android.app.Activity;
-import android.app.Fragment;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -30,11 +28,13 @@
import android.widget.Toast;
import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import com.android.tv.settings.device.storage.MoveAppProgressFragment;
import com.android.tv.settings.device.storage.MoveAppStepFragment;
-public class MoveAppActivity extends Activity implements MoveAppStepFragment.Callback {
+public class MoveAppActivity extends FragmentActivity implements MoveAppStepFragment.Callback {
private static final String TAG = "MoveAppActivity";
@@ -84,7 +84,7 @@
final String packageName = getIntent().getStringExtra(ARG_PACKAGE_NAME);
final Fragment fragment = MoveAppStepFragment.newInstance(packageName, packageDesc);
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, fragment)
.commit();
}
@@ -116,7 +116,7 @@
final MoveAppProgressFragment fragment = MoveAppProgressFragment
.newInstance(mPackageManager.getApplicationLabel(applicationInfo));
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content, fragment)
.commit();
}
diff --git a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamVoiceAction.java b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamVoiceAction.java
index 9d4a3f6..3816246 100644
--- a/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamVoiceAction.java
+++ b/Settings/src/com/android/tv/settings/device/display/daydream/DaydreamVoiceAction.java
@@ -16,18 +16,19 @@
package com.android.tv.settings.device.display.daydream;
-import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
+import androidx.fragment.app.FragmentActivity;
+
import com.android.settingslib.dream.DreamBackend;
/**
* Activity that handles a SLEEP voice action (putting the device to sleep).
* Intent is launched by search activity.
*/
-public class DaydreamVoiceAction extends Activity {
+public class DaydreamVoiceAction extends FragmentActivity {
private static final String SLEEP_ACTION = "com.google.android.pano.action.SLEEP";
diff --git a/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java
index 3f0136a..fd9e9c8 100644
--- a/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/BackupAppsStepFragment.java
@@ -27,7 +27,7 @@
import android.util.ArrayMap;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -39,7 +39,7 @@
import java.util.List;
import java.util.Map;
-public class BackupAppsStepFragment extends GuidedStepFragment implements
+public class BackupAppsStepFragment extends GuidedStepSupportFragment implements
ApplicationsState.Callbacks {
private static final int ACTION_NO_APPS = 0;
diff --git a/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java b/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java
index cec37ad..e05299d 100644
--- a/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/ForgetPrivateConfirmFragment.java
@@ -21,7 +21,7 @@
import android.os.storage.VolumeRecord;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -29,7 +29,7 @@
import java.util.List;
-public class ForgetPrivateConfirmFragment extends GuidedStepFragment {
+public class ForgetPrivateConfirmFragment extends GuidedStepSupportFragment {
private static final int ACTION_ID_FORGET = 1;
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java b/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
index 42429b3..3eaa136 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatActivity.java
@@ -16,8 +16,6 @@
package com.android.tv.settings.device.storage;
-import android.app.Activity;
-import android.app.Fragment;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -34,13 +32,15 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.android.tv.settings.R;
import java.util.List;
-public class FormatActivity extends Activity
+public class FormatActivity extends FragmentActivity
implements FormatAsPrivateStepFragment.Callback,
FormatAsPublicStepFragment.Callback, SlowDriveStepFragment.Callback {
@@ -113,7 +113,7 @@
} else {
throw new IllegalStateException("No known action specified");
}
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, f)
.commit();
}
@@ -165,7 +165,7 @@
// TODO: better threshold
if (privateBench > 2000000000) {
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content,
SlowDriveStepFragment.newInstance())
.commit();
@@ -238,7 +238,7 @@
@Override
public void onRequestFormatAsPrivate(String diskId) {
final FormattingProgressFragment fragment = FormattingProgressFragment.newInstance();
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content, fragment)
.commit();
@@ -281,7 +281,7 @@
@Override
public void onRequestFormatAsPublic(String diskId, String volumeId) {
final FormattingProgressFragment fragment = FormattingProgressFragment.newInstance();
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content, fragment)
.commit();
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java
index 311bb83..3291318 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatAsPrivateStepFragment.java
@@ -20,7 +20,7 @@
import android.os.storage.DiskInfo;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -28,7 +28,7 @@
import java.util.List;
-public class FormatAsPrivateStepFragment extends GuidedStepFragment {
+public class FormatAsPrivateStepFragment extends GuidedStepSupportFragment {
private static final int ACTION_ID_FORMAT = 1;
// private static final int ACTION_ID_LEARN_MORE = 2;
diff --git a/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
index c2bc5f4..89e6d79 100644
--- a/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/FormatAsPublicStepFragment.java
@@ -16,7 +16,6 @@
package com.android.tv.settings.device.storage;
-import android.app.Fragment;
import android.os.Bundle;
import android.os.storage.DiskInfo;
import android.os.storage.StorageManager;
@@ -24,7 +23,8 @@
import android.text.TextUtils;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.fragment.app.Fragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -32,7 +32,7 @@
import java.util.List;
-public class FormatAsPublicStepFragment extends GuidedStepFragment {
+public class FormatAsPublicStepFragment extends GuidedStepSupportFragment {
private static final int ACTION_ID_BACKUP = 1;
private static final int ACTION_ID_FORMAT = 2;
diff --git a/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java b/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
index 287e27e..e92cb23 100644
--- a/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/MigrateStorageActivity.java
@@ -16,7 +16,6 @@
package com.android.tv.settings.device.storage;
-import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -32,7 +31,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -43,7 +43,7 @@
import java.util.List;
import java.util.Objects;
-public class MigrateStorageActivity extends Activity {
+public class MigrateStorageActivity extends FragmentActivity {
private static final String TAG = "MigrateStorageActivity";
private static final String EXTRA_MIGRATE_HERE =
@@ -96,7 +96,7 @@
return;
}
mTargetVolumeDesc = storageManager.getBestVolumeDescription(mTargetVolumeInfo);
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.add(android.R.id.content,
MigrateConfirmationStepFragment.newInstance(mTargetVolumeDesc))
.commit();
@@ -107,7 +107,7 @@
return;
}
mVolumeDesc = storageManager.getBestVolumeDescription(mVolumeInfo);
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.add(android.R.id.content,
ChooseStorageStepFragment.newInstance(mVolumeInfo))
.commit();
@@ -147,7 +147,7 @@
private void startMigrationInternal() {
try {
mMoveId = mPackageManager.movePrimaryStorage(mTargetVolumeInfo);
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content,
MigrateProgressFragment.newInstance(mTargetVolumeDesc))
.commitNow();
@@ -183,7 +183,7 @@
Toast.LENGTH_SHORT).show();
}
- public static class MigrateConfirmationStepFragment extends GuidedStepFragment {
+ public static class MigrateConfirmationStepFragment extends GuidedStepSupportFragment {
private static final String ARG_VOLUME_DESC = "volumeDesc";
private static final int ACTION_CONFIRM = 1;
@@ -235,7 +235,7 @@
}
}
- public static class ChooseStorageStepFragment extends GuidedStepFragment {
+ public static class ChooseStorageStepFragment extends GuidedStepSupportFragment {
private List<VolumeInfo> mCandidateVolumes;
diff --git a/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java
index 6605f54..81f83bc 100644
--- a/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/MoveAppStepFragment.java
@@ -27,7 +27,7 @@
import android.util.Log;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -36,7 +36,7 @@
import java.io.File;
import java.util.List;
-public class MoveAppStepFragment extends GuidedStepFragment {
+public class MoveAppStepFragment extends GuidedStepSupportFragment {
private static final String TAG = "MoveAppStepFragment";
diff --git a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
index d3841dc..a39c4f1 100644
--- a/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/NewStorageActivity.java
@@ -16,7 +16,6 @@
package com.android.tv.settings.device.storage;
-import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -31,7 +30,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -40,7 +40,7 @@
import java.util.List;
-public class NewStorageActivity extends Activity {
+public class NewStorageActivity extends FragmentActivity {
private static final String TAG = "NewStorageActivity";
@@ -80,7 +80,7 @@
"NewStorageActivity launched without specifying missing storage");
}
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, MissingStorageFragment.newInstance(fsUuid))
.commit();
} else {
@@ -91,14 +91,14 @@
"NewStorageActivity launched without specifying new storage");
}
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.add(android.R.id.content, NewStorageFragment.newInstance(volumeId, diskId))
.commit();
}
}
}
- public static class NewStorageFragment extends GuidedStepFragment {
+ public static class NewStorageFragment extends GuidedStepSupportFragment {
private static final int ACTION_BROWSE = 1;
private static final int ACTION_FORMAT_AS_PRIVATE = 2;
@@ -259,7 +259,7 @@
}
}
- public static class MissingStorageFragment extends GuidedStepFragment {
+ public static class MissingStorageFragment extends GuidedStepSupportFragment {
private String mFsUuid;
private String mDescription;
diff --git a/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java b/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java
index 47c2b47..b2e7d67 100644
--- a/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/ResetActivity.java
@@ -17,7 +17,6 @@
package com.android.tv.settings.device.storage;
import android.annotation.Nullable;
-import android.app.Activity;
import android.app.ActivityManager;
import android.content.Context;
import android.content.Intent;
@@ -29,7 +28,8 @@
import android.util.Log;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -38,7 +38,7 @@
import java.util.List;
-public class ResetActivity extends Activity {
+public class ResetActivity extends FragmentActivity {
private static final String TAG = "ResetActivity";
@@ -54,11 +54,12 @@
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState == null) {
- GuidedStepFragment.addAsRoot(this, ResetFragment.newInstance(), android.R.id.content);
+ GuidedStepSupportFragment
+ .addAsRoot(this, ResetFragment.newInstance(), android.R.id.content);
}
}
- public static class ResetFragment extends GuidedStepFragment {
+ public static class ResetFragment extends GuidedStepSupportFragment {
public static ResetFragment newInstance() {
@@ -108,7 +109,7 @@
}
}
- public static class ResetConfirmFragment extends GuidedStepFragment {
+ public static class ResetConfirmFragment extends GuidedStepSupportFragment {
public static ResetConfirmFragment newInstance() {
diff --git a/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java b/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java
index 5166d6f..c0403d6 100644
--- a/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java
+++ b/Settings/src/com/android/tv/settings/device/storage/SlowDriveStepFragment.java
@@ -19,7 +19,7 @@
import android.os.Bundle;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -27,7 +27,7 @@
import java.util.List;
-public class SlowDriveStepFragment extends GuidedStepFragment {
+public class SlowDriveStepFragment extends GuidedStepSupportFragment {
public interface Callback {
void onSlowDriveWarningComplete();
diff --git a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
index 07764ac..4eb543e 100644
--- a/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
+++ b/Settings/src/com/android/tv/settings/device/storage/UnmountActivity.java
@@ -16,8 +16,6 @@
package com.android.tv.settings.device.storage;
-import android.app.Activity;
-import android.app.Fragment;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -32,7 +30,9 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@@ -42,7 +42,7 @@
import java.util.List;
-public class UnmountActivity extends Activity {
+public class UnmountActivity extends FragmentActivity {
private static final String TAG = "UnmountActivity";
@@ -83,7 +83,7 @@
if (volumeInfo.getType() == VolumeInfo.TYPE_PRIVATE) {
final Fragment fragment = UnmountPrivateStepFragment.newInstance(mUnmountVolumeId);
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content, fragment)
.commit();
} else {
@@ -102,7 +102,7 @@
public void onRequestUnmount() {
final Fragment fragment = UnmountProgressFragment.newInstance(mUnmountVolumeDesc);
- getFragmentManager().beginTransaction()
+ getSupportFragmentManager().beginTransaction()
.replace(android.R.id.content, fragment)
.commit();
// Post this so that it will presumably run after onResume, if we're calling from onCreate()
@@ -149,7 +149,7 @@
}
}
- public static class UnmountPrivateStepFragment extends GuidedStepFragment {
+ public static class UnmountPrivateStepFragment extends GuidedStepSupportFragment {
private static final int ACTION_ID_UNMOUNT = 1;
diff --git a/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java b/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java
index d36a6a5..f7cacd1 100644
--- a/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java
+++ b/Settings/src/com/android/tv/settings/deviceadmin/DeviceAdminAdd.java
@@ -35,12 +35,14 @@
import android.util.EventLog;
import android.util.Log;
+import androidx.fragment.app.FragmentActivity;
+
import org.xmlpull.v1.XmlPullParserException;
import java.io.IOException;
import java.util.List;
-public class DeviceAdminAdd extends Activity {
+public class DeviceAdminAdd extends FragmentActivity {
static final String TAG = "DeviceAdminAdd";
DevicePolicyManager mDPM;
diff --git a/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java b/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java
index 4dcfc1e..c2a1a2f 100644
--- a/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java
+++ b/Settings/src/com/android/tv/settings/dialog/ProgressDialogFragment.java
@@ -16,7 +16,6 @@
package com.android.tv.settings.dialog;
-import android.app.Fragment;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.text.TextUtils;
@@ -30,6 +29,7 @@
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
import com.android.tv.settings.R;
diff --git a/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java b/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java
index 56e6a82..1bdf241 100644
--- a/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java
+++ b/Settings/src/com/android/tv/settings/system/InputCustomNameFragment.java
@@ -20,7 +20,7 @@
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -29,7 +29,7 @@
import java.util.List;
@Keep
-public class InputCustomNameFragment extends GuidedStepFragment {
+public class InputCustomNameFragment extends GuidedStepSupportFragment {
private static final String ARG_CURRENT_NAME = "current_name";
private static final String ARG_DEFAULT_NAME = "default_name";
diff --git a/Settings/src/com/android/tv/settings/system/development/AdbDialog.java b/Settings/src/com/android/tv/settings/system/development/AdbDialog.java
index d9343e2..cce35b3 100644
--- a/Settings/src/com/android/tv/settings/system/development/AdbDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/AdbDialog.java
@@ -21,7 +21,7 @@
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -30,7 +30,7 @@
import java.util.List;
@Keep
-public class AdbDialog extends GuidedStepFragment {
+public class AdbDialog extends GuidedStepSupportFragment {
public interface Callback {
void onEnableAdbConfirm();
diff --git a/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java b/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java
index 5172f06..672f182 100644
--- a/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/AdbKeysDialog.java
@@ -26,7 +26,7 @@
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -35,7 +35,7 @@
import java.util.List;
@Keep
-public class AdbKeysDialog extends GuidedStepFragment {
+public class AdbKeysDialog extends GuidedStepSupportFragment {
private static final String TAG = "AdbKeysDialog";
@NonNull
diff --git a/Settings/src/com/android/tv/settings/system/development/AppPicker.java b/Settings/src/com/android/tv/settings/system/development/AppPicker.java
index 6f0680e..9ff1286 100644
--- a/Settings/src/com/android/tv/settings/system/development/AppPicker.java
+++ b/Settings/src/com/android/tv/settings/system/development/AppPicker.java
@@ -17,7 +17,6 @@
package com.android.tv.settings.system.development;
import android.annotation.Nullable;
-import android.app.Activity;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
@@ -29,7 +28,8 @@
import android.text.TextUtils;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -39,7 +39,7 @@
import java.util.Comparator;
import java.util.List;
-public class AppPicker extends Activity {
+public class AppPicker extends FragmentActivity {
public static final String EXTRA_REQUESTIING_PERMISSION
= "com.android.settings.extra.REQUESTIING_PERMISSION";
@@ -52,13 +52,13 @@
final String permissionName = getIntent().getStringExtra(EXTRA_REQUESTIING_PERMISSION);
final Boolean debuggableOnly = getIntent().getBooleanExtra(EXTRA_DEBUGGABLE, false);
- GuidedStepFragment.addAsRoot(this,
+ GuidedStepSupportFragment.addAsRoot(this,
AppPickerFragment.newInstance(permissionName, debuggableOnly),
android.R.id.content);
}
}
- public static class AppPickerFragment extends GuidedStepFragment {
+ public static class AppPickerFragment extends GuidedStepSupportFragment {
private String mPermissionName;
private boolean mDebuggableOnly;
diff --git a/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java b/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java
index f802316..457ed72 100644
--- a/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/EnableDevelopmentDialog.java
@@ -21,7 +21,7 @@
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -30,7 +30,7 @@
import java.util.List;
@Keep
-public class EnableDevelopmentDialog extends GuidedStepFragment {
+public class EnableDevelopmentDialog extends GuidedStepSupportFragment {
public interface Callback {
void onEnableDevelopmentConfirm();
diff --git a/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java b/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java
index 086c748..6a1707d 100644
--- a/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java
+++ b/Settings/src/com/android/tv/settings/system/development/OemUnlockDialog.java
@@ -21,7 +21,7 @@
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
-import androidx.leanback.app.GuidedStepFragment;
+import androidx.leanback.app.GuidedStepSupportFragment;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
@@ -30,7 +30,7 @@
import java.util.List;
@Keep
-public class OemUnlockDialog extends GuidedStepFragment {
+public class OemUnlockDialog extends GuidedStepSupportFragment {
public interface Callback {
void onOemUnlockConfirm();
