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

Merge "Use feature flag to show/hide AllInOneTetherSettings"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-03 08:32:29 +00:00
committed by Android (Google) Code Review
parent 36c3446b28 d2a7f9ae79
commit 6068d12752
11 changed files with 84 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -33,13 +33,16 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.FeatureFlagUtils;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.AllInOneTetherSettings;
import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.TetherUtil;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -110,8 +113,8 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
// Grey out if provisioning is not available.
mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));
if (mContext.getResources().getBoolean(R.bool.config_show_all_in_one_tether_settings)) {
mPreference.setFragment("com.android.settings.AllInOneTetherSettings");
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE)) {
mPreference.setFragment(AllInOneTetherSettings.class.getName());
}
}
}