Merge "Remove reference to R.id.summary_container." (e3cee294) · Commits · e / os / android_packages_apps_Settings

res/xml/development_settings.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,8 @@
		<Preference
		android:key="quick_settings_tiles"
		android:title="@string/quick_settings_developer_tiles"
		android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment" />
		android:fragment="com.android.settings.development.qstile.DevelopmentTileConfigFragment"
		settings:searchable="false" />

		<!-- Configure trust agent behavior -->
		<SwitchPreference

src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java

+8 −28

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.settings.applications.manageapplications;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.graphics.drawable.Drawable;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;
		@@ -41,10 +40,6 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
		private final TextView mAppName;
		private final ImageView mAppIcon;

		private final boolean mKeepStableHeight;

		@VisibleForTesting
		View mSummaryContainer;
		@VisibleForTesting
		final TextView mSummary;
		@VisibleForTesting
		@@ -54,20 +49,18 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
		@VisibleForTesting
		final Switch mSwitch;

		ApplicationViewHolder(View itemView, boolean keepStableHeight) {
		ApplicationViewHolder(View itemView) {
		super(itemView);
		mAppName = itemView.findViewById(android.R.id.title);
		mAppIcon = itemView.findViewById(android.R.id.icon);
		mSummaryContainer = itemView.findViewById(R.id.summary_container);
		mSummary = itemView.findViewById(android.R.id.summary);
		mDisabled = itemView.findViewById(R.id.appendix);
		mKeepStableHeight = keepStableHeight;
		mSwitch = itemView.findViewById(R.id.switchWidget);
		mWidgetContainer = itemView.findViewById(android.R.id.widget_frame);
		}

		static View newView(ViewGroup parent) {
		return newView(parent, false);
		return newView(parent, false /* twoTarget */);
		}

		static View newView(ViewGroup parent, boolean twoTarget) {
		@@ -92,12 +85,10 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {

		void setSummary(CharSequence summary) {
		mSummary.setText(summary);
		updateSummaryContainer();
		}

		void setSummary(@StringRes int summary) {
		mSummary.setText(summary);
		updateSummaryContainer();
		}

		void setEnabled(boolean isEnabled) {
		@@ -133,17 +124,6 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
		} else {
		mDisabled.setVisibility(View.GONE);
		}
		updateSummaryContainer();
		}

		void updateSummaryContainer() {
		if (mKeepStableHeight) {
		mSummaryContainer.setVisibility(View.VISIBLE);
		return;
		}
		final boolean hasContent =
		!TextUtils.isEmpty(mDisabled.getText()) \|\| !TextUtils.isEmpty(mSummary.getText());
		mSummaryContainer.setVisibility(hasContent ? View.VISIBLE : View.GONE);
		}

		void updateSizeText(AppEntry entry, CharSequence invalidSizeStr, int whichSize) {

src/com/android/settings/applications/manageapplications/ManageApplications.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -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;

src/com/android/settings/applications/managedomainurls/DomainAppPreference.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -47,12 +47,6 @@ public class DomainAppPreference extends AppPreference {
		setState();
		}

		@Override
		public void onBindViewHolder(PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);
		holder.itemView.findViewById(R.id.appendix).setVisibility(View.GONE);
		}

		public void reuse() {
		setState();
		notifyChanged();

src/com/android/settings/widget/AppCheckBoxPreference.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.LinearLayout;
		import android.widget.TextView;

		import androidx.preference.CheckBoxPreference;
		import androidx.preference.PreferenceViewHolder;
		@@ -46,11 +45,6 @@ public class AppCheckBoxPreference extends CheckBoxPreference {
		public void onBindViewHolder(PreferenceViewHolder holder) {
		super.onBindViewHolder(holder);

		final TextView appendix = (TextView) holder.findViewById(R.id.appendix);
		if (appendix != null) {
		appendix.setVisibility(View.GONE);
		}

		final LinearLayout layout = (LinearLayout) holder.findViewById(R.id.summary_container);
		if (layout != null) {
		// If summary doesn't exist, make it gone