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

Merge "QS: Fix up non-dual target touches"

Browse Source
This commit is contained in:
Jason Monk
2017-03-03 19:38:46 +00:00
committed by Android (Google) Code Review
parent b52ba99d00 e4f2661946
commit 99f8f8050f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/qs/QSTileView.java
View File

@@ -84,7 +84,6 @@ public class QSTileView extends QSTileBaseView {
mLabel = (TextView) mLabelContainer.findViewById(R.id.tile_label);
mPadLock = (ImageView) mLabelContainer.findViewById(R.id.restricted_padlock);
mLabelContainer.setBackground(newTileBackground());
addView(mLabelContainer);
}
@@ -102,6 +101,11 @@ public class QSTileView extends QSTileBaseView {
mLabel.setText(state.label);
}
mDivider.setVisibility(state.dualTarget ? View.VISIBLE : View.INVISIBLE);
if (state.dualTarget != mLabelContainer.isClickable()) {
mLabelContainer.setClickable(state.dualTarget);
mLabelContainer.setLongClickable(state.dualTarget);
mLabelContainer.setBackground(state.dualTarget ? newTileBackground() : null);
}
mLabel.setEnabled(!state.disabledByPolicy);
mPadLock.setVisibility(state.disabledByPolicy ? View.VISIBLE : View.GONE);
}
@@ -110,7 +114,9 @@ public class QSTileView extends QSTileBaseView {
public void init(OnClickListener click, OnClickListener secondaryClick,
OnLongClickListener longClick) {
super.init(click, secondaryClick, longClick);
mLabelContainer.setClickable(true);
mLabelContainer.setOnClickListener(secondaryClick);
mLabelContainer.setOnLongClickListener(longClick);
mLabelContainer.setClickable(false);
mLabelContainer.setLongClickable(false);
}
}