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

Merge "Fix bug: Add some controllers to AllInOneTetherSettings Lifecycle"

Browse Source
This commit is contained in:
Zhen Zhang
2020-02-12 05:12:53 +00:00
committed by Android (Google) Code Review
parent ac68e5b23f aef1e8db96
commit bb3ddcb602
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/AllInOneTetherSettings.java
View File

@@ -46,7 +46,10 @@ import androidx.preference.PreferenceGroup;
import com.android.settings.core.FeatureFlags; import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.datausage.DataSaverBackend; import com.android.settings.datausage.DataSaverBackend;
import com.android.settings.network.BluetoothTetherPreferenceController;
import com.android.settings.network.TetherEnabler; import com.android.settings.network.TetherEnabler;
import com.android.settings.network.UsbTetherPreferenceController;
import com.android.settings.network.WifiTetherDisablePreferenceController;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBarController; import com.android.settings.widget.SwitchBarController;
@@ -66,7 +69,6 @@ import java.util.concurrent.atomic.AtomicReference;
/** /**
* Displays preferences for all Tethering options. * Displays preferences for all Tethering options.
* TODO(b/147323306): Add tether option preferences into this fragment after controllers created.
*/ */
@SearchIndexable @SearchIndexable
public final class AllInOneTetherSettings extends RestrictedDashboardFragment public final class AllInOneTetherSettings extends RestrictedDashboardFragment
@@ -172,6 +174,9 @@ public final class AllInOneTetherSettings extends RestrictedDashboardFragment
mSecurityPreferenceController = use(WifiTetherSecurityPreferenceController.class); mSecurityPreferenceController = use(WifiTetherSecurityPreferenceController.class);
mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class); mPasswordPreferenceController = use(WifiTetherPasswordPreferenceController.class);
mApBandPreferenceController = use(WifiTetherApBandPreferenceController.class); mApBandPreferenceController = use(WifiTetherApBandPreferenceController.class);
getSettingsLifecycle().addObserver(use(UsbTetherPreferenceController.class));
getSettingsLifecycle().addObserver(use(BluetoothTetherPreferenceController.class));
getSettingsLifecycle().addObserver(use(WifiTetherDisablePreferenceController.class));
} }
@Override @Override