commit 0aad74a38766fb2a6b4127c88937f316afd8abae
author Philip P. Moltmann <moltmann@google.com> Wed Jun 29 14:58:02 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 29 14:58:03 2016 +0000
tree c0ed99dc2ebbf609eabf91549fa88ed2ab75c387
parent cc1379bfea1dea1c90d5b0d8659dd3fe5b41adcc
parent 23176395a5413ad55eeaff780e60f36e7d70977e

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

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

diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java
index 08bbd97..dc7df52 100644
--- a/src/com/android/settings/print/PrintJobSettingsFragment.java
+++ b/src/com/android/settings/print/PrintJobSettingsFragment.java
@@ -26,11 +26,13 @@
 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 @@
     }
 
     @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 @@
         processArguments();
 
         setHasOptionsMenu(true);
+
+        return  view;
     }
 
     @Override

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

diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 42d8a8d..6ef900b 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -39,6 +39,7 @@
 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 @@
     }
 
     @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 @@
         if (!TextUtils.isEmpty(title)) {
             getActivity().setTitle(title);
         }
+
+        return root;
     }
 
     @Override

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

diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 82a18ee..49d254c 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -43,6 +43,7 @@
 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 @@
     }
 
     @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 @@
 
         mPrintServicesController = new PrintServicesController();
         getLoaderManager().initLoader(LOADER_ID_PRINT_SERVICES, null, mPrintServicesController);
+
+        return root;
     }
 
     @Override