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

Merge "Fix a bug in navup button."

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-15 00:27:56 +00:00
committed by Android (Google) Code Review
parent 8da6f88a9b 9cf5cfb03d
commit 23665b0766
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/dashboard/DashboardFragment.java
View File

@@ -234,10 +234,15 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
if (tile.icon != null) { if (tile.icon != null) {
pref.setIcon(tile.icon.loadDrawable(context)); 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); final Intent intent = new Intent(tile.intent);
pref.setOnPreferenceClickListener(preference -> { pref.setOnPreferenceClickListener(preference -> {
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
getActivity().startActivityForResult(intent, 0); getActivity().startActivityForResult(intent, 0);
return true; return true;
}); });