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

Make Emergency info searchable in Settings

Browse Source 
am: 6056eba0e7

Change-Id: I09900a3059d69f870f8f5efdabad4c67cadf49ae
This commit is contained in:
mariagpuyol
2016-06-24 17:12:40 +00:00
committed by android-build-merger
parent d916e7de44 6056eba0e7
commit eb086f075e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/users/UserSettings.java
View File

@@ -615,9 +615,9 @@ public class UserSettings extends SettingsPreferenceFragment
} }
} }
private boolean emergencyInfoActivityPresent() { private static boolean emergencyInfoActivityPresent(Context context) {
Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO).setPackage("com.android.emergency"); Intent intent = new Intent(ACTION_EDIT_EMERGENCY_INFO).setPackage("com.android.emergency");
List<ResolveInfo> infos = getContext().getPackageManager().queryIntentActivities(intent, 0); List<ResolveInfo> infos = context.getPackageManager().queryIntentActivities(intent, 0);
if (infos == null || infos.isEmpty()) { if (infos == null || infos.isEmpty()) {
return false; return false;
} }
@@ -863,7 +863,7 @@ public class UserSettings extends SettingsPreferenceFragment
mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null); mUserCaps.mDisallowAddUser ? mUserCaps.mEnforcedAdmin : null);
} }
if (emergencyInfoActivityPresent()) { if (emergencyInfoActivityPresent(getContext())) {
mEmergencyInfoPreference.setOnPreferenceClickListener(this); mEmergencyInfoPreference.setOnPreferenceClickListener(this);
mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER); mEmergencyInfoPreference.setOrder(Preference.DEFAULT_ORDER);
preferenceScreen.addPreference(mEmergencyInfoPreference); preferenceScreen.addPreference(mEmergencyInfoPreference);
@@ -1147,6 +1147,12 @@ public class UserSettings extends SettingsPreferenceFragment
data.screenTitle = res.getString(R.string.user_settings_title); data.screenTitle = res.getString(R.string.user_settings_title);
result.add(data); result.add(data);
} }
if (emergencyInfoActivityPresent(context)) {
data = new SearchIndexableRaw(context);
data.title = res.getString(R.string.emergency_info_title);
data.screenTitle = res.getString(R.string.emergency_info_title);
result.add(data);
}
return result; return result;
} }
}; };