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

9
src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java
View File

@@ -36,7 +36,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 com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.FooterPreferenceMixin;
import com.android.settingslib.widget.FooterPreferenceMixinCompat;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
@@ -52,7 +52,7 @@ public class DiscoverableFooterPreferenceController extends BasePreferenceContro
BroadcastReceiver mBluetoothChangedReceiver;
@VisibleForTesting
LocalBluetoothManager mLocalManager;
private FooterPreferenceMixin mFooterPreferenceMixin;
private FooterPreferenceMixinCompat mFooterPreferenceMixin;
private FooterPreference mPreference;
private LocalBluetoothAdapter mLocalAdapter;
private AlwaysDiscoverable mAlwaysDiscoverable;
@@ -82,11 +82,12 @@ public class DiscoverableFooterPreferenceController extends BasePreferenceContro
}
public void init(DashboardFragment fragment) {
mFooterPreferenceMixin = new FooterPreferenceMixin(fragment, fragment.getLifecycle());
mFooterPreferenceMixin = new FooterPreferenceMixinCompat(fragment,
fragment.getSettingsLifecycle());
}
@VisibleForTesting
void init(FooterPreferenceMixin footerPreferenceMixin, FooterPreference preference,
void init(FooterPreferenceMixinCompat footerPreferenceMixin, FooterPreference preference,
AlwaysDiscoverable alwaysDiscoverable) {
mFooterPreferenceMixin = footerPreferenceMixin;
mPreference = preference;