PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings Fragment Migration (Build pass app)

Browse Source 
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:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java
View File

@@ -35,7 +35,7 @@ public class BluetoothA2dpHwOffloadRebootDialog extends InstrumentedDialogFragme
public static void show(DevelopmentSettingsDashboardFragment host,
BluetoothA2dpHwOffloadPreferenceController controller) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final BluetoothA2dpHwOffloadRebootDialog dialog =
new BluetoothA2dpHwOffloadRebootDialog();

2
src/com/android/settings/development/ClearAdbKeysWarningDialog.java
View File

@@ -34,7 +34,7 @@ public class ClearAdbKeysWarningDialog extends InstrumentedDialogFragment implem
public static final String TAG = "ClearAdbKeysDlg";
public static void show(Fragment host) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final ClearAdbKeysWarningDialog dialog =
new ClearAdbKeysWarningDialog();

7
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -166,7 +166,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
// Set up master switch
mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
mSwitchBarController = new DevelopmentSwitchBarController(
this /* DevelopmentSettings */, mSwitchBar, mIsAvailable, getLifecycle());
this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,
getSettingsLifecycle());
mSwitchBar.show();
// Restore UI state based on whether developer options is enabled
@@ -318,8 +319,8 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
mPreferenceControllers = new ArrayList<>();
return null;
}
mPreferenceControllers = buildPreferenceControllers(context, getActivity(), getLifecycle(),
this /* devOptionsDashboardFragment */,
mPreferenceControllers = buildPreferenceControllers(context, getActivity(),
getSettingsLifecycle(), this /* devOptionsDashboardFragment */,
new BluetoothA2dpConfigStore());
return mPreferenceControllers;
}

2
src/com/android/settings/development/DisableLogPersistWarningDialog.java
View File

@@ -38,7 +38,7 @@ public class DisableLogPersistWarningDialog extends InstrumentedDialogFragment i
return;
}
final Fragment hostFragment = (Fragment) host;
final FragmentManager manager = hostFragment.getActivity().getFragmentManager();
final FragmentManager manager = hostFragment.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final DisableLogPersistWarningDialog dialog =
new DisableLogPersistWarningDialog();

2
src/com/android/settings/development/EnableAdbWarningDialog.java
View File

@@ -34,7 +34,7 @@ public class EnableAdbWarningDialog extends InstrumentedDialogFragment implement
public static final String TAG = "EnableAdbDialog";
public static void show(Fragment host) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final EnableAdbWarningDialog dialog = new EnableAdbWarningDialog();
dialog.setTargetFragment(host, 0 /* requestCode */);

2
src/com/android/settings/development/EnableDevelopmentSettingWarningDialog.java
View File

@@ -37,7 +37,7 @@ public class EnableDevelopmentSettingWarningDialog extends InstrumentedDialogFra
final EnableDevelopmentSettingWarningDialog dialog =
new EnableDevelopmentSettingWarningDialog();
dialog.setTargetFragment(host, 0 /* requestCode */);
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
dialog.show(manager, TAG);
}

2
src/com/android/settings/development/EnableOemUnlockSettingWarningDialog.java
View File

@@ -34,7 +34,7 @@ public class EnableOemUnlockSettingWarningDialog extends InstrumentedDialogFragm
public static final String TAG = "EnableOemUnlockDlg";
public static void show(Fragment host) {
final FragmentManager manager = host.getActivity().getFragmentManager();
final FragmentManager manager = host.getActivity().getSupportFragmentManager();
if (manager.findFragmentByTag(TAG) == null) {
final EnableOemUnlockSettingWarningDialog dialog =
new EnableOemUnlockSettingWarningDialog();

6
src/com/android/settings/development/featureflags/FeatureFlagFooterPreferenceController.java
View File

@@ -22,18 +22,18 @@ import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
public class FeatureFlagFooterPreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart {
private FooterPreferenceMixin mFooterMixin;
private FooterPreferenceMixinCompat mFooterMixin;
public FeatureFlagFooterPreferenceController(Context context) {
super(context, "feature_flag_footer_pref");
}
public void setFooterMixin(FooterPreferenceMixin mixin) {
public void setFooterMixin(FooterPreferenceMixinCompat mixin) {
mFooterMixin = mixin;
}

2
src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java
View File

@@ -65,7 +65,7 @@ public class FeatureFlagsDashboard extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPrefControllers(context, getLifecycle());
return buildPrefControllers(context, getSettingsLifecycle());
}
private static List<AbstractPreferenceController> buildPrefControllers(Context context,