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

Merge "Revert "Revert "Fix test case fail"""

Browse Source
This commit is contained in:
Aurimas Liutikas
2018-12-19 22:41:46 +00:00
committed by Android (Google) Code Review
parent 347829525c fb643dc4b5
commit 727ce8ec66
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/core/InstrumentedPreferenceFragment.java
View File

@@ -22,6 +22,7 @@ import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import androidx.annotation.XmlRes; import androidx.annotation.XmlRes;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
@@ -78,6 +79,14 @@ public abstract class InstrumentedPreferenceFragment extends ObservablePreferenc
updateActivityTitleWithScreenTitle(getPreferenceScreen()); updateActivityTitleWithScreenTitle(getPreferenceScreen());
} }
@Override
public <T extends Preference> T findPreference(CharSequence key) {
if (key == null) {
return null;
}
return super.findPreference(key);
}
protected final Context getPrefContext() { protected final Context getPrefContext() {
return getPreferenceManager().getContext(); return getPreferenceManager().getContext();
} }