Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code clean up: remove some dead code.

Browse Source 
Test: existing tests pass
Change-Id: I1e0e6f8218b3a6550476fe1aa092f685d7433d53
This commit is contained in:
Fan Zhang
2017-03-17 12:55:21 -07:00
parent 3d19f90c32
commit 51fac1237d
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/drawer/DashboardCategory.java
View File

@@ -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() {

23
packages/SettingsLib/src/com/android/settingslib/drawer/SettingsDrawerActivity.java
View File

@@ -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++) {