diff --git a/res/layout/dashboard_status.xml b/res/layout/dashboard_status.xml deleted file mode 100644 index d9b28630153..00000000000 --- a/res/layout/dashboard_status.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 01b4a902793..f43c84bc63c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7369,8 +7369,6 @@ Control lock screen notifications Show or hide notification content - - Status All diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java index ee060343bfd..bb6a1bad5b9 100644 --- a/src/com/android/settings/InstrumentedFragment.java +++ b/src/com/android/settings/InstrumentedFragment.java @@ -31,7 +31,6 @@ public abstract class InstrumentedFragment extends PreferenceFragment { public static final int DASHBOARD_CONTAINER = UNDECLARED + 1; // Used by PreferenceActivity for the dummy fragment it adds, no useful data here. public static final int PREFERENCE_ACTIVITY_FRAGMENT = UNDECLARED + 2; - public static final int DASHBOARD_STATUS = UNDECLARED + 3; /** * Declare the view of this category. diff --git a/src/com/android/settings/dashboard/DashboardContainerFragment.java b/src/com/android/settings/dashboard/DashboardContainerFragment.java index 44129c6fa3e..5d8f092868b 100644 --- a/src/com/android/settings/dashboard/DashboardContainerFragment.java +++ b/src/com/android/settings/dashboard/DashboardContainerFragment.java @@ -33,15 +33,13 @@ import com.android.settings.InstrumentedFragment; import com.android.settings.R; import com.android.settings.widget.SlidingTabLayout; import com.android.settingslib.HelpUtils; -import com.android.settingslib.drawer.SettingsDrawerActivity; /** * Container for Dashboard fragments. */ public final class DashboardContainerFragment extends InstrumentedFragment { - private static final int INDEX_BRIEF_FRAGMENT = 0; - private static final int INDEX_SUMMARY_FRAGMENT = 1; + private static final int INDEX_SUMMARY_FRAGMENT = 0; private ViewPager mViewPager; private View mHeaderView; @@ -73,9 +71,6 @@ public final class DashboardContainerFragment extends InstrumentedFragment { public void onResume() { super.onResume(); final Activity activity = getActivity(); - if (activity instanceof SettingsDrawerActivity) { - ((SettingsDrawerActivity) getActivity()).setContentHeaderView(mHeaderView); - } } @Override @@ -98,8 +93,6 @@ public final class DashboardContainerFragment extends InstrumentedFragment { @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); } @@ -109,8 +102,6 @@ public final class DashboardContainerFragment extends InstrumentedFragment { @Override public Fragment getItem(int position) { switch (position) { - case INDEX_BRIEF_FRAGMENT: - return new DashboardStatusFragment(); case INDEX_SUMMARY_FRAGMENT: return new DashboardSummary(); default: @@ -123,7 +114,7 @@ public final class DashboardContainerFragment extends InstrumentedFragment { @Override public int getCount() { - return 2; + return 1; } } } diff --git a/src/com/android/settings/dashboard/DashboardStatusFragment.java b/src/com/android/settings/dashboard/DashboardStatusFragment.java deleted file mode 100644 index 66106be8f9e..00000000000 --- a/src/com/android/settings/dashboard/DashboardStatusFragment.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.dashboard; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.android.settings.InstrumentedFragment; -import com.android.settings.R; - -/** - * Dashboard fragment for showing status and suggestions. - */ -public final class DashboardStatusFragment extends InstrumentedFragment { - - @Override - protected int getMetricsCategory() { - return DASHBOARD_STATUS; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) { - return inflater.inflate(R.layout.dashboard_status, parent, false); - } -}