Remove the feature flag for using new title.
- remove all code that check for the feature flag, and use the new logic by default. Change-Id: I7fbe60da84c1c0f35e7241402a71d2bc4cd300e6 Fixes: 64564191 Test: make RunSettingsRoboTests
This commit is contained in:
@@ -29,7 +29,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.core.InstrumentedFragment;
|
||||
import com.android.settings.core.InstrumentedPreferenceFragment;
|
||||
import com.android.settings.password.ChooseLockSettingsHelper;
|
||||
|
||||
/* Class to prompt for conversion of userdata to file based encryption
|
||||
@@ -49,9 +48,7 @@ public class ConvertToFbe extends InstrumentedFragment {
|
||||
@Override
|
||||
public void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
if (InstrumentedPreferenceFragment.usePreferenceScreenTitle()) {
|
||||
getActivity().setTitle(R.string.convert_to_file_encryption);
|
||||
}
|
||||
getActivity().setTitle(R.string.convert_to_file_encryption);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user