Skip to content

Commit 7e4eb65

Browse files
author
run
committed
手势设置对话框点击back后消失
1 parent 1d18ced commit 7e4eb65

File tree

3 files changed

+39
-9
lines changed

3 files changed

+39
-9
lines changed

project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-20
14+
target=android-19
1515
proguard.config=proguard.cfg

src/com/leo/appmaster/quickgestures/ui/QuickGestureActivity.java

+14-8
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import android.os.Bundle;
1717
import android.preference.PreferenceManager;
1818
import android.provider.CallLog.Calls;
19+
import android.util.Log;
1920
import android.view.LayoutInflater;
2021
import android.view.MotionEvent;
2122
import android.view.View;
@@ -67,7 +68,7 @@ public class QuickGestureActivity extends BaseActivity implements OnTouchListene
6768
private AppMasterPreference mPre;
6869
private QuickGestureRadioSeekBarDialog mAlarmDialog;
6970
private QuickGestureSlideTimeDialog mSlideTimeDialog;
70-
private boolean mAlarmDialogFlag = false;
71+
public static boolean mAlarmDialogFlag = false;
7172
private List<QuickGsturebAppInfo> mFreeApps;
7273
private FreeDisturbSlideTimeAdapter mSlideTimeAdapter;
7374
private TextView mLeftTopView, mLeftBottomView, mRightTopView, mRightBottomView,
@@ -81,7 +82,7 @@ public class QuickGestureActivity extends BaseActivity implements OnTouchListene
8182
private String slidingArea = "";
8283
public static final String FROME_STATUSBAR = "from_statusbar";
8384
private boolean initFlag;
84-
85+
public static boolean isSureBt;
8586
@Override
8687
protected void onCreate(Bundle savedInstanceState) {
8788
super.onCreate(savedInstanceState);
@@ -152,6 +153,11 @@ public void run() {
152153
}
153154
}
154155

156+
@Override
157+
public void onBackPressed() {
158+
super.onBackPressed();
159+
}
160+
155161
private void initUi() {
156162
mTitleBar = (CommonTitleBar) findViewById(R.id.layout_quick_gesture_title_bar);
157163
mTitleBar.openBackView();
@@ -417,6 +423,7 @@ public void onClick(View arg0) {
417423

418424
@Override
419425
public void onClick(int progress) {
426+
isSureBt=true;
420427
boolean mLeftBottom = QuickGestureManager.getInstance(AppMasterApplication
421428
.getInstance()).isLeftBottom;
422429
boolean mRightBottm = QuickGestureManager.getInstance(AppMasterApplication
@@ -427,8 +434,7 @@ public void onClick(int progress) {
427434
.getInstance()).isRightCenter;
428435
if (mLeftBottom || mRightBottm || mLeftCenter || mRightCenter) {
429436
// save progress value
430-
mPre.setQuickGestureDialogSeekBarValue(mAlarmDialog
431-
.getSeekBarProgressValue());
437+
mPre.setQuickGestureDialogSeekBarValue(QuickGestureManager.getInstance(getApplicationContext()).mSlidAreaSize);
432438
// save sliding area value
433439
mPre.setDialogRadioLeftBottom(mLeftBottom);
434440
mPre.setDialogRadioRightBottom(mRightBottm);
@@ -440,9 +446,9 @@ public void onClick(int progress) {
440446
setSlidingAreaSetting();
441447
if (mAlarmDialog != null) {
442448
mAlarmDialog.dismiss();
443-
FloatWindowHelper.mEditQuickAreaFlag = false;
444-
mAlarmDialogFlag = false;
445-
updateFloatWindowBackGroudColor();
449+
// FloatWindowHelper.mEditQuickAreaFlag = false;
450+
// mAlarmDialogFlag = false;
451+
// updateFloatWindowBackGroudColor();
446452
}
447453
} else {
448454
Toast.makeText(
@@ -455,7 +461,7 @@ public void onClick(int progress) {
455461
}
456462
}
457463
});
458-
mAlarmDialog.setCancelable(false);
464+
mAlarmDialog.setCancelable(true);
459465
mAlarmDialog.show();
460466
mAlarmDialogFlag = true;
461467
updateFloatWindowBackGroudColor();

src/com/leo/appmaster/quickgestures/ui/QuickGestureRadioSeekBarDialog.java

+24
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.content.DialogInterface;
66
import android.content.res.Resources;
77
import android.graphics.drawable.Drawable;
8+
import android.util.Log;
89
import android.view.LayoutInflater;
910
import android.view.View;
1011
import android.widget.AdapterView.OnItemClickListener;
@@ -132,6 +133,29 @@ public void onClick(DialogInterface dialog, int arg1) {
132133
setCanceledOnTouchOutside(true);
133134
}
134135

136+
@Override
137+
public void onBackPressed() {
138+
super.onBackPressed();
139+
}
140+
141+
@Override
142+
public void onDetachedFromWindow() {
143+
super.onDetachedFromWindow();
144+
// Log.e(FloatWindowHelper.RUN_TAG, "结束");
145+
if (!QuickGestureActivity.isSureBt) {
146+
QuickGestureManager.getInstance(mContext).mSlidAreaSize = AppMasterPreference
147+
.getInstance(
148+
mContext).getQuickGestureDialogSeekBarValue();
149+
FloatWindowHelper.updateView(mContext,
150+
QuickGestureManager.getInstance(mContext).mSlidAreaSize);
151+
} else {
152+
QuickGestureActivity.isSureBt = false;
153+
}
154+
FloatWindowHelper.mEditQuickAreaFlag = false;
155+
QuickGestureActivity.mAlarmDialogFlag = false;
156+
FloatWindowHelper.updateFloatWindowBackgroudColor(false);
157+
}
158+
135159
public void setOnClickListener(OnDiaogClickListener listener) {
136160
mListener = listener;
137161
}

0 commit comments

Comments
 (0)