am 1ae1373a: Merge "Wire up new hideycling ok button to persist setting." into klp-dev

* commit '1ae1373aeddbd5f3e090db8d5862a22eab0e4ed6':
  Wire up new hideycling ok button to persist setting.
This commit is contained in:
John Spurlock
2013-10-13 16:30:21 -07:00
committed by Android Git Automerger

View File

@ -170,11 +170,13 @@ public class TransientNavigationConfirmation {
private static final int BGCOLOR = 0x80000000; private static final int BGCOLOR = 0x80000000;
private static final int OFFSET_DP = 48; private static final int OFFSET_DP = 48;
private final Runnable mConfirm;
private final ColorDrawable mColor = new ColorDrawable(0); private final ColorDrawable mColor = new ColorDrawable(0);
private ValueAnimator mColorAnim; private ValueAnimator mColorAnim;
public ClingWindowView(Context context) { public ClingWindowView(Context context, Runnable confirm) {
super(context); super(context);
mConfirm = confirm;
setClickable(true); setClickable(true);
setBackground(mColor); setBackground(mColor);
} }
@ -195,7 +197,7 @@ public class TransientNavigationConfirmation {
ok.setOnClickListener(new OnClickListener() { ok.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
handleHide(); mConfirm.run();
} }
}); });
addView(clingLayout, new FrameLayout.LayoutParams( addView(clingLayout, new FrameLayout.LayoutParams(
@ -249,7 +251,7 @@ public class TransientNavigationConfirmation {
mPromptPackage = pkg; mPromptPackage = pkg;
if (DEBUG) Slog.d(TAG, "Showing transient navigation confirmation for " + pkg); if (DEBUG) Slog.d(TAG, "Showing transient navigation confirmation for " + pkg);
mClingWindow = new ClingWindowView(mContext); mClingWindow = new ClingWindowView(mContext, confirmAction(pkg));
// we will be hiding the nav bar, so layout as if it's already hidden // we will be hiding the nav bar, so layout as if it's already hidden
mClingWindow.setSystemUiVisibility( mClingWindow.setSystemUiVisibility(