Merge "Fix a bug in navup button." (23665b07) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/dashboard/DashboardFragment.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -234,10 +234,15 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
		if (tile.icon != null) {
		pref.setIcon(tile.icon.loadDrawable(context));
		}
		if (tile.intent != null) {
		final Bundle metadata = tile.metaData;
		if (metadata != null) {
		String clsName = metadata.getString(SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS);
		if (!TextUtils.isEmpty(clsName)) {
		pref.setFragment(clsName);
		}
		} else if (tile.intent != null) {
		final Intent intent = new Intent(tile.intent);
		pref.setOnPreferenceClickListener(preference -> {
		intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
		getActivity().startActivityForResult(intent, 0);
		return true;
		});