Merge "Add set clickable false after clear click listener" into qt-dev (8cf05752) · Commits · e / os / android_packages_apps_DocumentsUI

src/com/android/documentsui/inspector/KeyValueRow.java

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,13 +15,11 @@
	*/		*/
	package com.android.documentsui.inspector;		package com.android.documentsui.inspector;

	import androidx.annotation.StringRes;
	import android.content.Context;		import android.content.Context;
	import android.content.res.ColorStateList;		import android.content.res.ColorStateList;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.content.res.TypedArray;		import android.content.res.TypedArray;
	import android.graphics.Paint;		import android.graphics.Paint;
	import androidx.annotation.Nullable;
	import android.text.Selection;		import android.text.Selection;
	import android.text.Spannable;		import android.text.Spannable;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	@@ -30,6 +28,9 @@ import android.view.textclassifier.TextClassifier;
	import android.widget.LinearLayout;		import android.widget.LinearLayout;
	import android.widget.TextView;		import android.widget.TextView;

			import androidx.annotation.Nullable;
			import androidx.annotation.StringRes;

	import com.android.documentsui.R;		import com.android.documentsui.R;

	/**		/**
	@@ -87,6 +88,12 @@ public class KeyValueRow extends LinearLayout {
	});		});
	}		}

			@Override
			public boolean hasOnClickListeners() {
			TextView value = findViewById(R.id.table_row_value);
			return value.hasOnClickListeners();
			}

	@Override		@Override
	public void setOnClickListener(OnClickListener callback) {		public void setOnClickListener(OnClickListener callback) {
	TextView clickable = ((TextView) findViewById(R.id.table_row_value));		TextView clickable = ((TextView) findViewById(R.id.table_row_value));
	@@ -107,5 +114,6 @@ public class KeyValueRow extends LinearLayout {
	}		}
	reset.setPaintFlags(reset.getPaintFlags() & ~Paint.UNDERLINE_TEXT_FLAG);		reset.setPaintFlags(reset.getPaintFlags() & ~Paint.UNDERLINE_TEXT_FLAG);
	reset.setOnClickListener(null);		reset.setOnClickListener(null);
			reset.setClickable(false);
	}		}
	}		}

src/com/android/documentsui/inspector/TableView.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,6 @@
	*/		*/
	package com.android.documentsui.inspector;		package com.android.documentsui.inspector;

	import androidx.annotation.StringRes;
	import android.content.Context;		import android.content.Context;
	import android.content.res.Resources;		import android.content.res.Resources;
	import android.text.Selection;		import android.text.Selection;
	@@ -28,6 +27,8 @@ import android.view.textclassifier.TextClassifier;
	import android.widget.LinearLayout;		import android.widget.LinearLayout;
	import android.widget.TextView;		import android.widget.TextView;

			import androidx.annotation.StringRes;

	import com.android.documentsui.R;		import com.android.documentsui.R;
	import com.android.documentsui.inspector.InspectorController.TableDisplay;		import com.android.documentsui.inspector.InspectorController.TableDisplay;

	@@ -103,7 +104,6 @@ public class TableView extends LinearLayout implements TableDisplay {
	put(mRes.getString(keyId), value);		put(mRes.getString(keyId), value);
	}		}


	/**		/**
	* Puts or updates a value in the table view.		* Puts or updates a value in the table view.
	*/		*/
	@@ -114,7 +114,7 @@ public class TableView extends LinearLayout implements TableDisplay {
	row = createKeyValueRow(this);		row = createKeyValueRow(this);
	row.setKey(key);		row.setKey(key);
	mRows.put(key, row);		mRows.put(key, row);
	} else {		} else if (row.hasOnClickListeners()) {
	row.removeOnClickListener();		row.removeOnClickListener();
	}		}