commit 23665b076655b7e69f28a85218f1630c2534ba52
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Oct 15 00:27:56 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 15 00:27:57 2016 +0000
tree 18bc78433dcd6c794c5a0724731bbc9b30287d54
parent 8da6f88a9b58385a6a63f92dcde58bdfa4d663a5
parent 9cf5cfb03dbf99e0d3cee1ac35b852822569f2ce

Merge "Fix a bug in navup button."

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

diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index a72717d..a5876ce 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -234,10 +234,15 @@
             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;
                 });