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

Merge "Sharesheet - make loading placeholders unclickable" into qt-dev

Browse Source 
am: f3c58fd242

Change-Id: If10f7852a94fa14a1d0e1f6fc837cbbff0ead416
This commit is contained in:
Mike Digman
2019-05-06 05:35:28 -07:00
committed by android-build-merger
parent d011076494 f3c58fd242
commit 1daa3db772
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -2188,7 +2188,7 @@ public class ChooserActivity extends ResolverActivity {
protected void onBindView(View view, TargetInfo info) {
super.onBindView(view, info);
// If target is loading, show a special placeholder shape in the label
// If target is loading, show a special placeholder shape in the label, make unclickable
final ViewHolder holder = (ViewHolder) view.getTag();
if (info instanceof PlaceHolderTargetInfo) {
final int maxWidth = getResources().getDimensionPixelSize(
@@ -2196,9 +2196,12 @@ public class ChooserActivity extends ResolverActivity {
holder.text.setMaxWidth(maxWidth);
holder.text.setBackground(getResources().getDrawable(
R.drawable.chooser_direct_share_label_placeholder, getTheme()));
// Prevent rippling by removing background containing ripple
holder.itemView.setBackground(null);
} else {
holder.text.setMaxWidth(Integer.MAX_VALUE);
holder.text.setBackground(null);
holder.itemView.setBackground(holder.defaultItemViewBackground);
}
}

5
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -2061,11 +2061,16 @@ public class ResolverActivity extends Activity {
}
static class ViewHolder {
public View itemView;
public Drawable defaultItemViewBackground;
public TextView text;
public TextView text2;
public ImageView icon;
public ViewHolder(View view) {
itemView = view;
defaultItemViewBackground = view.getBackground();
text = (TextView) view.findViewById(com.android.internal.R.id.text1);
text2 = (TextView) view.findViewById(com.android.internal.R.id.text2);
icon = (ImageView) view.findViewById(R.id.icon);