Merge "Add an empty status fragment for status and suggestions."

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/android/settings/dashboard/DashboardContainerFragment.java
index f839ae7,ccc95fc..b41ebe3
--- 1/src/com/android/settings/dashboard/DashboardContainerFragment.java
--- 2/src/com/android/settings/dashboard/DashboardContainerFragment.java
+++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java
@@@ -27,9 -27,10 +29,11 @@@ import android.view.MenuInflater
  import android.view.View;
  import android.view.ViewGroup;
  
 +import com.android.settings.HelpUtils;
  import com.android.settings.InstrumentedFragment;
  import com.android.settings.R;
+ import com.android.settings.widget.SlidingTabLayout;
+ import com.android.settingslib.drawer.SettingsDrawerActivity;
  
  /**
   * Container for Dashboard fragments.
@@@ -60,18 -61,32 +70,40 @@@ public final class DashboardContainerFr
      }
  
      @Override
+     public void onResume() {
+         super.onResume();
+         final Activity activity = getActivity();
+         if (activity instanceof SettingsDrawerActivity) {
+             ((SettingsDrawerActivity) getActivity()).setContentHeaderView(mHeaderView);
+         }
+     }
+ 
++    @Override
 +    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 +        super.onCreateOptionsMenu(menu, inflater);
 +        if (getActivity() == null) return;
 +        HelpUtils.prepareHelpMenuItem(getActivity(), menu, R.string.help_uri_dashboard,
 +                getClass().getName());
 +    }
 +
      private static final class DashboardViewPagerAdapter extends FragmentPagerAdapter {
  
+         private final Context mContext;
  
-         public DashboardViewPagerAdapter(FragmentManager fragmentManager) {
+         public DashboardViewPagerAdapter(Context context, FragmentManager fragmentManager) {
              super(fragmentManager);
+             mContext = context;
+         }
+ 
+         @Override
+         public CharSequence getPageTitle(int position) {
+             switch (position) {
+                 case INDEX_BRIEF_FRAGMENT:
+                     return mContext.getString(R.string.page_tab_title_status);
+                 case INDEX_SUMMARY_FRAGMENT:
+                     return mContext.getString(R.string.page_tab_title_summary);
+             }
+             return super.getPageTitle(position);
          }
  
          @Override