From 5b4c06362c546f179a54ca7032ba4c9bbc989578 Mon Sep 17 00:00:00 2001 From: Yoshihide Sogawa <12043975+YoshihideSogawa@users.noreply.github.com> Date: Tue, 22 Jan 2019 17:43:31 +0900 Subject: [PATCH 1/2] Fixed bug that CustomFloatingView was not displayed after overlay permission --- .../sample/fragment/FloatingViewControlFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sample/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewControlFragment.java b/sample/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewControlFragment.java index b0a6d68..e357d43 100644 --- a/sample/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewControlFragment.java +++ b/sample/src/main/java/jp/co/recruit_lifestyle/sample/fragment/FloatingViewControlFragment.java @@ -132,7 +132,7 @@ private void showFloatingView(Context context, boolean isShowOverlayPermission, // オーバレイパーミッションの表示 if (isShowOverlayPermission) { final Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, Uri.parse("package:" + context.getPackageName())); - startActivityForResult(intent, CHATHEAD_OVERLAY_PERMISSION_REQUEST_CODE); + startActivityForResult(intent, isCustomFloatingView ? CUSTOM_OVERLAY_PERMISSION_REQUEST_CODE : CHATHEAD_OVERLAY_PERMISSION_REQUEST_CODE); } } From b4a83da09880dc1c2cc8e3291bd0bf0525259976 Mon Sep 17 00:00:00 2001 From: Yoshihide Sogawa <12043975+YoshihideSogawa@users.noreply.github.com> Date: Tue, 22 Jan 2019 17:54:20 +0900 Subject: [PATCH 2/2] Fixed bug where mVelocityTracker caused NullPointerException --- .../recruit_lifestyle/android/floatingview/FloatingView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java b/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java index a18062a..5f5656a 100644 --- a/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java +++ b/library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java @@ -878,8 +878,8 @@ else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) // 拡大率をもとに戻す setScale(SCALE_NORMAL); - // destroy VelocityTracker - if (!mIsMoveAccept) { + // destroy VelocityTracker (#103) + if (!mIsMoveAccept && mVelocityTracker != null) { mVelocityTracker.recycle(); mVelocityTracker = null; }