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

3
src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java
View File

@@ -23,6 +23,7 @@ import com.android.settings.widget.ActionButtonPreference;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
@@ -36,7 +37,7 @@ public class BluetoothDetailsButtonsController extends BluetoothDetailsControlle
private boolean mConnectButtonInitialized;
private ActionButtonPreference mActionButtons;
public BluetoothDetailsButtonsController(Context context, PreferenceFragment fragment,
public BluetoothDetailsButtonsController(Context context, PreferenceFragmentCompat fragment,
CachedBluetoothDevice device, Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
mIsConnected = device.isConnected();

5
src/com/android/settings/bluetooth/BluetoothDetailsController.java
View File

@@ -26,6 +26,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
@@ -37,10 +38,10 @@ public abstract class BluetoothDetailsController extends AbstractPreferenceContr
OnPause, OnResume {
protected final Context mContext;
protected final PreferenceFragment mFragment;
protected final PreferenceFragmentCompat mFragment;
protected final CachedBluetoothDevice mCachedDevice;
public BluetoothDetailsController(Context context, PreferenceFragment fragment,
public BluetoothDetailsController(Context context, PreferenceFragmentCompat fragment,
CachedBluetoothDevice device, Lifecycle lifecycle) {
super(context);
mContext = context;

3
src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java
View File

@@ -30,6 +30,7 @@ import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.core.lifecycle.Lifecycle;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
@@ -42,7 +43,7 @@ public class BluetoothDetailsHeaderController extends BluetoothDetailsController
private LocalBluetoothManager mLocalManager;
private CachedBluetoothDeviceManager mDeviceManager;
public BluetoothDetailsHeaderController(Context context, PreferenceFragment fragment,
public BluetoothDetailsHeaderController(Context context, PreferenceFragmentCompat fragment,
CachedBluetoothDevice device, Lifecycle lifecycle,
LocalBluetoothManager bluetoothManager) {
super(context, fragment, device, lifecycle);

9
src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java
View File

@@ -22,23 +22,24 @@ import com.android.settings.R;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
/**
* This class adds the device MAC address to a footer.
*/
public class BluetoothDetailsMacAddressController extends BluetoothDetailsController {
FooterPreferenceMixin mFooterPreferenceMixin;
FooterPreferenceMixinCompat mFooterPreferenceMixin;
FooterPreference mFooterPreference;
public BluetoothDetailsMacAddressController(Context context,
PreferenceFragment fragment,
PreferenceFragmentCompat fragment,
CachedBluetoothDevice device,
Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, lifecycle);
mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment, lifecycle);
}
@Override

3
src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java
View File

@@ -36,6 +36,7 @@ import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -55,7 +56,7 @@ public class BluetoothDetailsProfilesController extends BluetoothDetailsControll
private CachedBluetoothDevice mCachedDevice;
private PreferenceCategory mProfilesContainer;
public BluetoothDetailsProfilesController(Context context, PreferenceFragment fragment,
public BluetoothDetailsProfilesController(Context context, PreferenceFragmentCompat fragment,
LocalBluetoothManager manager, CachedBluetoothDevice device, Lifecycle lifecycle) {
super(context, fragment, device, lifecycle);
mManager = manager;

2
src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
View File

@@ -120,7 +120,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
if (mCachedDevice != null) {
Lifecycle lifecycle = getLifecycle();
Lifecycle lifecycle = getSettingsLifecycle();
controllers.add(new BluetoothDetailsHeaderController(context, this, mCachedDevice,
lifecycle, mManager));
controllers.add(new BluetoothDetailsButtonsController(context, this, mCachedDevice,

9
src/com/android/settings/bluetooth/BluetoothPairingDialog.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.bluetooth;
import android.annotation.Nullable;
import android.app.Activity;
import android.bluetooth.BluetoothDevice;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -26,12 +25,13 @@ import android.content.IntentFilter;
import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
/**
* BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
* for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
*/
public class BluetoothPairingDialog extends Activity {
public class BluetoothPairingDialog extends FragmentActivity {
public static final String FRAGMENT_TAG = "bluetooth.pairing.fragment";
private BluetoothPairingController mBluetoothPairingController;
@@ -70,7 +70,8 @@ public class BluetoothPairingDialog extends Activity {
boolean fragmentFound = true;
// check if the fragment has been preloaded
BluetoothPairingDialogFragment bluetoothFragment =
(BluetoothPairingDialogFragment) getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
(BluetoothPairingDialogFragment) getSupportFragmentManager().
findFragmentByTag(FRAGMENT_TAG);
// dismiss the fragment if it is already used
if (bluetoothFragment != null && (bluetoothFragment.isPairingControllerSet()
|| bluetoothFragment.isPairingDialogActivitySet())) {
@@ -86,7 +87,7 @@ public class BluetoothPairingDialog extends Activity {
bluetoothFragment.setPairingDialogActivity(this);
// pass the fragment to the manager when it is created from scratch
if (!fragmentFound) {
bluetoothFragment.show(getFragmentManager(), FRAGMENT_TAG);
bluetoothFragment.show(getSupportFragmentManager(), FRAGMENT_TAG);
}
/*
* Leave this registered through pause/resume since we still want to