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

Commit 0aad74a3 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Setup up print settings fragments in onCreateView instead of onCreate." into nyc-mr1-dev

parents cc1379bf 23176395

src/com/android/settings/print/PrintJobSettingsFragment.java

+7 −2
Original line number Diff line number Diff line
@@ -26,11 +26,13 @@ import android.print.PrintManager.PrintJobStateChangeListener; 
import android.support.v7.preference.Preference;

import android.text.TextUtils;

import android.text.format.DateUtils;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.View;



import android.view.ViewGroup;

import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -70,8 +72,9 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { 
    }



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        View view = super.onCreateView(inflater, container, savedInstanceState);



        addPreferencesFromResource(R.xml.print_job_settings);

        mPrintJobPreference = findPreference(PRINT_JOB_PREFERENCE);
@@ -86,6 +89,8 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment { 
        processArguments();



        setHasOptionsMenu(true);



        return  view;

    }



    @Override

src/com/android/settings/print/PrintServiceSettingsFragment.java

+6 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import android.printservice.PrintServiceInfo; 
import android.text.TextUtils;

import android.util.Log;

import android.util.TypedValue;

import android.view.LayoutInflater;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuItem;
@@ -132,8 +133,9 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
    }



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        View root = super.onCreateView(inflater, container, savedInstanceState);



        mServiceEnabled = getArguments().getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
@@ -141,6 +143,8 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment 
        if (!TextUtils.isEmpty(title)) {

            getActivity().setTitle(title);

        }



        return root;

    }



    @Override

src/com/android/settings/print/PrintSettingsFragment.java

+6 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.support.v7.preference.PreferenceScreen; 
import android.text.TextUtils;

import android.text.format.DateUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View.OnClickListener;

import android.view.ViewGroup;
@@ -104,8 +105,9 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment 
    }



    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        View root = super.onCreateView(inflater, container, savedInstanceState);

        addPreferencesFromResource(R.xml.print_settings);



        mActivePrintJobsCategory = (PreferenceCategory) findPreference(
@@ -119,6 +121,8 @@ public class PrintSettingsFragment extends ProfileSettingsPreferenceFragment 


        mPrintServicesController = new PrintServicesController();

        getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICES, null, mPrintServicesController);



        return root;

    }



    @Override