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

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

Merge "Remove getCategoryKey() from DashboardFragment children."

parents a1bae0ad 7e6df837

src/com/android/settings/DateTimeSettings.java

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ public class DateTimeSettings extends DashboardFragment implements 
        return MetricsEvent.DATE_TIME;

    }



    @Override

    protected String getCategoryKey() {

        return null;

    }



    @Override

    protected String getLogTag() {

        return TAG;

src/com/android/settings/DisplaySettings.java

+0 −5
Original line number Diff line number Diff line
@@ -67,11 +67,6 @@ public class DisplaySettings extends DashboardFragment { 
        mProgressiveDisclosureMixin.setTileLimit(4);

    }



    @Override

    protected String getCategoryKey() {

        return CategoryKey.CATEGORY_DISPLAY;

    }



    @Override

    protected int getPreferenceScreenResId() {

        if (mDashboardFeatureProvider.isEnabled()) {

src/com/android/settings/accounts/AccountDetailDashboardFragment.java

+4 −10
Original line number Diff line number Diff line
@@ -22,15 +22,14 @@ import android.os.Bundle; 
import android.os.UserHandle;

import android.os.UserManager;

import android.support.annotation.VisibleForTesting;



import android.support.v7.preference.Preference;



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

import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.PreferenceController;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settingslib.accounts.AuthenticatorHelper;

import com.android.settingslib.drawer.CategoryKey;

import com.android.settingslib.drawer.Tile;



import java.util.ArrayList;
@@ -93,11 +92,6 @@ public class AccountDetailDashboardFragment extends DashboardFragment { 
        return MetricsEvent.ACCOUNT;

    }



    @Override

    protected String getCategoryKey() {

        return CategoryKey.CATEGORY_ACCOUNT;

    }



    @Override

    protected String getLogTag() {

        return TAG;

src/com/android/settings/accounts/UserAndAccountDashboardFragment.java

+0 −6
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.settings.core.PreferenceController; 
import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settingslib.drawer.CategoryKey;

import com.android.settingslib.drawer.Tile;



import java.util.ArrayList;
@@ -44,11 +43,6 @@ public class UserAndAccountDashboardFragment extends DashboardFragment { 
        return MetricsEvent.ACCOUNT;

    }



    @Override

    protected String getCategoryKey() {

        return CategoryKey.CATEGORY_ACCOUNT;

    }



    @Override

    protected String getLogTag() {

        return TAG;

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

+0 −6
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.settings.core.PreferenceController; 
import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settingslib.drawer.CategoryKey;



import java.util.ArrayList;

import java.util.Arrays;
@@ -41,11 +40,6 @@ public class AdvancedAppSettings extends DashboardFragment { 


    static final String TAG = "AdvancedAppSettings";



    @Override

    protected String getCategoryKey() {

        return CategoryKey.CATEGORY_APPS_DEFAULT;

    }



    @Override

    protected String getLogTag() {

        return TAG;