PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove reference to R.id.summary_container.

Browse Source 
It's deleted in another CL.

Fixes: 123317946
Test: visual/robo
Change-Id: I7b461ba68e8b56946e4effc26850776881236ec7
This commit is contained in:
Fan Zhang
2019-03-15 14:11:39 -07:00
parent f47cb9a008
commit d3b848713d
10 changed files with 22 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -33,7 +33,6 @@ import static com.android.settings.applications.manageapplications.AppFilterRegi
import android.annotation.Nullable;
import android.annotation.StringRes;
import android.app.Activity;
import android.app.ActivityManager;
import android.app.settings.SettingsEnums;
import android.app.usage.IUsageStatsManager;
import android.content.Context;
@@ -50,22 +49,18 @@ import android.text.TextUtils;
import android.util.ArraySet;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.Filter;
import android.widget.FrameLayout;
import android.widget.SearchView;
import android.widget.Spinner;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
@@ -1059,14 +1054,13 @@ public class ManageApplications extends InstrumentedFragment
@Override
public ApplicationViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view;
final View view;
if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
view = ApplicationViewHolder.newView(parent, true /* twoTarget */);
} else {
view = ApplicationViewHolder.newView(parent, false /* twoTarget */);
}
return new ApplicationViewHolder(view,
shouldUseStableItemHeight(mManageApplications.mListType));
return new ApplicationViewHolder(view);
}
@Override
@@ -1153,11 +1147,6 @@ public class ManageApplications extends InstrumentedFragment
mSearchFilter.filter(query);
}
@VisibleForTesting
static boolean shouldUseStableItemHeight(int listType) {
return true;
}
private static boolean packageNameEquals(PackageItemInfo info1, PackageItemInfo info2) {
if (info1 == null || info2 == null) {
return false;