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

Merge "Fix nav up button from running process details." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-12 01:25:36 +00:00
committed by Android (Google) Code Review
parent 375c22d031 7685987af1
commit 5ebfe92f09
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/applications/RunningProcessesView.java
View File

@@ -411,7 +411,7 @@ public class RunningProcessesView extends FrameLayout
args.putBoolean(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground); args.putBoolean(RunningServiceDetails.KEY_BACKGROUND, mAdapter.mShowBackground);
SettingsActivity sa = (SettingsActivity) mOwner.getActivity(); 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); R.string.runningservicedetails_settings_title, null, null, 0);
} }
} }

7
src/com/android/settings/applications/RunningServiceDetails.java
View File

@@ -33,9 +33,9 @@ import android.widget.Button;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import java.io.File; import java.io.File;
@@ -497,14 +497,15 @@ public class RunningServiceDetails extends InstrumentedPreferenceFragment
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
mUid = getArguments().getInt(KEY_UID, -1); mUid = getArguments().getInt(KEY_UID, -1);
mUserId = getArguments().getInt(KEY_USER_ID, 0); mUserId = getArguments().getInt(KEY_USER_ID, 0);
mProcessName = getArguments().getString(KEY_PROCESS, null); mProcessName = getArguments().getString(KEY_PROCESS, null);
mShowBackground = getArguments().getBoolean(KEY_BACKGROUND, false); mShowBackground = getArguments().getBoolean(KEY_BACKGROUND, false);
mAm = (ActivityManager) getActivity().getSystemService(Context.ACTIVITY_SERVICE); mAm = (ActivityManager) getActivity().getSystemService(Context.ACTIVITY_SERVICE);
mInflater = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE); mInflater = (LayoutInflater) getActivity().getSystemService(
Context.LAYOUT_INFLATER_SERVICE);
mState = RunningState.getInstance(getActivity()); mState = RunningState.getInstance(getActivity());
} }