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

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

Merge "Code clean up: remove some dead code."

parents 44277fbd 51fac123
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ public class DashboardCategory implements Parcelable {
    /**
     * List of the category's children
     */
    public List<Tile> tiles = new ArrayList<Tile>();
    public List<Tile> tiles = new ArrayList<>();


    public DashboardCategory() {
+0 −23
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.os.Bundle;
import android.provider.Settings;
import android.util.ArraySet;
import android.util.Log;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -40,10 +39,8 @@ import android.widget.FrameLayout;
import android.widget.Toolbar;

import com.android.settingslib.R;
import com.android.settingslib.applications.InterestingConfigChanges;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

public class SettingsDrawerActivity extends Activity {
@@ -63,15 +60,6 @@ public class SettingsDrawerActivity extends Activity {

    private FrameLayout mContentHeaderContainer;

    // Remove below after new IA
    @Deprecated
    private static List<DashboardCategory> sDashboardCategories;
    @Deprecated
    private static HashMap<Pair<String, String>, Tile> sTileCache;
    @Deprecated
    private static InterestingConfigChanges sConfigTracker;
    // Remove above after new IA

    @Override
    protected void onCreate(@Nullable Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -175,17 +163,6 @@ public class SettingsDrawerActivity extends Activity {
        getActionBar().setDisplayHomeAsUpEnabled(true);
    }

    public List<DashboardCategory> getDashboardCategories() {
        if (sDashboardCategories == null) {
            sTileCache = new HashMap<>();
            sConfigTracker = new InterestingConfigChanges();
            // Apply initial current config.
            sConfigTracker.applyNewConfig(getResources());
            sDashboardCategories = TileUtils.getCategories(this, sTileCache);
        }
        return sDashboardCategories;
    }

    protected void onCategoriesChanged() {
        final int N = mCategoryListeners.size();
        for (int i = 0; i < N; i++) {