From 7685987af142cb3b3f9f04e4064976ae8f89ca58 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 11 Apr 2017 13:40:10 -0700 Subject: [PATCH] Fix nav up button from running process details. Change-Id: I08fbbc1dab886dd26e7d780c0fc1b50c98a0e2f8 Fix: 36667083 Test: manual --- .../applications/RunningProcessesView.java | 2 +- .../applications/RunningServiceDetails.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/applications/RunningProcessesView.java b/src/com/android/settings/applications/RunningProcessesView.java index dcb6f9e95aa..b36543504f2 100644 --- a/src/com/android/settings/applications/RunningProcessesView.java +++ b/src/com/android/settings/applications/RunningProcessesView.java @@ -411,7 +411,7 @@ public class RunningProcessesView extends FrameLayout args.putBoolean(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground); SettingsActivity sa = (SettingsActivity) mOwner.getActivity(); - sa.startPreferencePanel(null, RunningServiceDetails.class.getName(), args, + sa.startPreferencePanel(mOwner, RunningServiceDetails.class.getName(), args, R.string.runningservicedetails_settings_title, null, null, 0); } } diff --git a/src/com/android/settings/applications/RunningServiceDetails.java b/src/com/android/settings/applications/RunningServiceDetails.java index 9a173bca588..84c2ee52dd1 100644 --- a/src/com/android/settings/applications/RunningServiceDetails.java +++ b/src/com/android/settings/applications/RunningServiceDetails.java @@ -33,9 +33,9 @@ import android.widget.Button; import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.R; import com.android.settings.Utils; +import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import java.io.File; @@ -493,19 +493,20 @@ public class RunningServiceDetails extends InstrumentedPreferenceFragment } }); } - + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + setHasOptionsMenu(true); mUid = getArguments().getInt(KEY_UID, -1); mUserId = getArguments().getInt(KEY_USER_ID, 0); mProcessName = getArguments().getString(KEY_PROCESS, null); mShowBackground = getArguments().getBoolean(KEY_BACKGROUND, false); - - mAm = (ActivityManager)getActivity().getSystemService(Context.ACTIVITY_SERVICE); - mInflater = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE); - + + mAm = (ActivityManager) getActivity().getSystemService(Context.ACTIVITY_SERVICE); + mInflater = (LayoutInflater) getActivity().getSystemService( + Context.LAYOUT_INFLATER_SERVICE); + mState = RunningState.getInstance(getActivity()); }