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

Fix sim pin settings

Browse Source 
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes: 27419276
Fixes: 27529989
This commit is contained in:
Jason Monk
2016-03-30 11:41:45 -04:00
parent d719ae8e37
commit 5b39710e6d
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/PreferenceActivity.java
View File

@@ -17,7 +17,6 @@ package com.android.settings;
import android.annotation.Nullable;
import android.os.Bundle;
import android.support.v14.preference.PreferenceFragment;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -57,7 +56,7 @@ public class PreferenceActivity extends SettingsActivity {
|| PreferenceActivityFragment.class.getName().equals(fragmentName);
}
public static class PreferenceActivityFragment extends PreferenceFragment {
public static class PreferenceActivityFragment extends SettingsPreferenceFragment {
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
((PreferenceActivity) getActivity()).mFragment = this;
@@ -70,6 +69,14 @@ public class PreferenceActivity extends SettingsActivity {
}
return super.onPreferenceTreeClick(preference);
}
@Override
protected int getMetricsCategory() {
if (getActivity() instanceof InstrumentedPreferenceActivity) {
return ((InstrumentedPreferenceActivity) getActivity()).getMetricsCategory();
}
return InstrumentedFragment.PREFERENCE_ACTIVITY_FRAGMENT;
}
}
}