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

Remove code that check for dashboard feature.

Browse Source 
- remove DashboardFeatureProvider.isEnabled() and all relating code
and tests.

Bug: 35764802
Test: make RunSettingsRoboTests
Change-Id: If7796677abc8904b7436525836d50cdef38e37a4
This commit is contained in:
Doris Ling
2017-03-03 17:12:47 -08:00
parent 50aa0008fc
commit f2cf2aea37
53 changed files with 155 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/nfc/NfcPreferenceController.java
View File

@@ -68,17 +68,10 @@ public class NfcPreferenceController extends PreferenceController
mNfcEnabler = new NfcEnabler(mContext, mNfcPreference, mBeamPreference);
String toggleable = Settings.Global.getString(mContext.getContentResolver(),
Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS);
final boolean useNewIA = FeatureFactory.getFactory(mContext)
.getDashboardFeatureProvider(mContext).isEnabled();
// Manually set dependencies for NFC when not toggleable.
if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_NFC)) {
if (useNewIA) {
mAirplaneModeObserver = new AirplaneModeObserver();
updateNfcPreference();
} else {
mNfcPreference.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
mBeamPreference.setDependency(AirplaneModePreferenceController.KEY_TOGGLE_AIRPLANE);
}
mAirplaneModeObserver = new AirplaneModeObserver();
updateNfcPreference();
}
}