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

Make PreferenceController a mixin

Browse Source 
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
This commit is contained in:
Tony Mantler
2017-06-13 13:09:25 -07:00
parent 4bac421538
commit 1d583e125f
203 changed files with 1027 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java
View File

@@ -21,9 +21,11 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceGroup;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
public abstract class P2pCategoryPreferenceController extends PreferenceController {
public abstract class P2pCategoryPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
protected PreferenceGroup mCategory;

6
src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java
View File

@@ -22,9 +22,11 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
public class P2pThisDevicePreferenceController extends PreferenceController {
public class P2pThisDevicePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private Preference mPreference;

9
src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java
View File

@@ -24,17 +24,18 @@ import android.support.annotation.VisibleForTesting;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
/**
* {@link PreferenceController} to toggle Wifi Direct preference on Wi-Fi state.
* {@link PreferenceControllerMixin} to toggle Wifi Direct preference on Wi-Fi state.
*/
public class WifiP2pPreferenceController extends PreferenceController implements
LifecycleObserver, OnPause, OnResume {
public class WifiP2pPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnPause, OnResume {
private static final String KEY_WIFI_DIRECT = "wifi_direct";

6
src/com/android/settings/wifi/p2p/WifiP2pSettings.java
View File

@@ -51,8 +51,8 @@ import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
@@ -168,8 +168,8 @@ public class WifiP2pSettings extends DashboardFragment
}
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
final List<PreferenceController> controllers = new ArrayList<>();
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
mPersistentCategoryController =
new P2pPersistentCategoryPreferenceController(context);
mPeerCategoryController =