Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ebfe92f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 375c22d0 7685987a

src/com/android/settings/applications/RunningProcessesView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

        }

        }

    }

    }

src/com/android/settings/applications/RunningServiceDetails.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -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());

    }

    }