Merge branch 'hotfix-whitebars' into 'sprint-alexandria' (d6d2bff0) · Commits · e / os / BlissLauncher

app/src/main/java/foundation/e/blisslauncher/features/launcher/LauncherActivity.java

+0 −43

Original line number	Diff line number	Diff line
		@@ -200,8 +200,6 @@ public class LauncherActivity extends AppCompatActivity implements
		private FrameLayout swipeSearchContainer;
		private RelativeLayout workspace;
		private View backgroundLayer;
		private View scrollCornerRight;
		private View scrollCornerLeft;

		private BroadcastReceiver mWeatherReceiver = new BroadcastReceiver() {
		@Override
		@@ -295,8 +293,6 @@ public class LauncherActivity extends AppCompatActivity implements
		workspace = mLauncherView.findViewById(R.id.workspace);
		mHorizontalPager = mLauncherView.findViewById(R.id.pages_container);
		backgroundLayer = mLauncherView.findViewById(R.id.background_layer);
		scrollCornerLeft = mLauncherView.findViewById(R.id.scroll_corner_left);
		scrollCornerRight = mLauncherView.findViewById(R.id.scroll_corner_right);
		statusBarHeight = 0;
		int resourceId = getResources().getIdentifier("status_bar_height", "dimen", "android");
		if (resourceId > 0) {
		@@ -314,10 +310,6 @@ public class LauncherActivity extends AppCompatActivity implements
		maxDistanceForFolderCreation = (int) (0.45f * mDeviceProfile.iconSizePx);

		scrollCorner = mDeviceProfile.iconDrawablePaddingPx / 2;
		scrollCornerLeft.getLayoutParams().width = scrollCorner;
		((RelativeLayout.LayoutParams) scrollCornerLeft.getLayoutParams()).topMargin = (int) (statusBarHeight + Utilities.pxFromDp(8, this));
		scrollCornerRight.getLayoutParams().width = scrollCorner;
		((RelativeLayout.LayoutParams) scrollCornerRight.getLayoutParams()).topMargin = (int) (statusBarHeight + Utilities.pxFromDp(8, this));

		wobbleAnimation = AnimationUtils.loadAnimation(this, R.anim.wobble);
		wobbleReverseAnimation = AnimationUtils.loadAnimation(this, R.anim.wobble_reverse);
		@@ -2123,20 +2115,6 @@ public class LauncherActivity extends AppCompatActivity implements
		if (mWobblingCountDownTimer != null) {
		mWobblingCountDownTimer.cancel();
		}
		AnimatorSet animatorSet = new AnimatorSet();
		animatorSet.play(ObjectAnimator.ofFloat(scrollCornerLeft, View.ALPHA, 1f))
		.with(ObjectAnimator.ofFloat(scrollCornerRight, View.ALPHA, 1f));
		animatorSet.setDuration(100);
		animatorSet.addListener(new AnimatorListenerAdapter() {

		@Override
		public void onAnimationStart(Animator animation) {
		super.onAnimationStart(animation);
		scrollCornerRight.setVisibility(VISIBLE);
		scrollCornerLeft.setVisibility(VISIBLE);
		}
		});
		animatorSet.start();
		} else if (dragEvent.getAction() == DragEvent.ACTION_DRAG_LOCATION) {
		cX = dragEvent.getX() - dragShadowBuilder.xOffset;
		cY = mHorizontalPager.getY() + dragEvent.getY()
		@@ -2299,27 +2277,6 @@ public class LauncherActivity extends AppCompatActivity implements
		isDragging = false;
		}

		AnimatorSet animatorSet = new AnimatorSet();
		animatorSet.play(ObjectAnimator.ofFloat(scrollCornerLeft, View.ALPHA, 0f))
		.with(ObjectAnimator.ofFloat(scrollCornerRight, View.ALPHA, 0f));
		animatorSet.setDuration(100);
		animatorSet.addListener(new AnimatorListenerAdapter() {
		@Override
		public void onAnimationCancel(Animator animation) {
		super.onAnimationCancel(animation);
		scrollCornerRight.setVisibility(GONE);
		scrollCornerLeft.setVisibility(GONE);
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		super.onAnimationEnd(animation);
		scrollCornerRight.setVisibility(GONE);
		scrollCornerLeft.setVisibility(GONE);
		}
		});
		animatorSet.start();

		if (movingApp.getVisibility() != VISIBLE) {
		movingApp.setVisibility(View.VISIBLE);
		}

app/src/main/res/layout/activity_main.xml

+0 −20

Original line number	Diff line number	Diff line
		@@ -14,26 +14,6 @@
		android:alpha="0"
		android:background="@color/dark_grey_44" />

		<View
		android:id="@+id/scroll_corner_left"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_above="@+id/dock"
		android:layout_alignParentStart="true"
		android:layout_alignParentTop="true"
		android:background="#88FFFFFF"
		android:visibility="gone"/>

		<View
		android:id="@+id/scroll_corner_right"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_above="@+id/dock"
		android:layout_alignParentTop="true"
		android:layout_alignParentEnd="true"
		android:background="#88FFFFFF"
		android:visibility="gone"/>

		<foundation.e.blisslauncher.core.customviews.HorizontalPager
		android:id="@+id/pages_container"
		android:layout_width="match_parent"