Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fd5dfc1 authored by Selim Cinek's avatar Selim Cinek
Browse files

Removed the visual speedbump 

Change-Id: Iaacfc75ba691db07522e9d1d893aecd6b3be6338
parent 587cbf30

packages/SystemUI/res/layout/status_bar_notification_speed_bump.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2014 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->



<!-- Extends FrameLayout -->

<com.android.systemui.statusbar.SpeedBumpView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="@dimen/speed_bump_height"

    android:visibility="gone"

    >

    <com.android.systemui.statusbar.AlphaOptimizedView

        android:id="@+id/speedbump_line"

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="#6fdddddd"

        android:layout_gravity="center_vertical"/>

</com.android.systemui.statusbar.SpeedBumpView>

packages/SystemUI/src/com/android/systemui/statusbar/SpeedBumpView.java

deleted100644 → 0
+0 −129
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.systemui.statusbar;



import android.content.Context;

import android.util.AttributeSet;

import android.view.animation.AnimationUtils;

import android.view.animation.Interpolator;

import com.android.systemui.R;



/**

 * The view representing the separation between important and less important notifications

 */

public class SpeedBumpView extends ExpandableView {



    private final int mSpeedBumpHeight;

    private AlphaOptimizedView mLine;

    private boolean mIsVisible = true;

    private final Interpolator mFastOutSlowInInterpolator;



    public SpeedBumpView(Context context, AttributeSet attrs) {

        super(context, attrs);

        mSpeedBumpHeight = getResources()

                .getDimensionPixelSize(R.dimen.speed_bump_height);

        mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(getContext(),

                android.R.interpolator.fast_out_slow_in);

    }



    @Override

    protected void onFinishInflate() {

        super.onFinishInflate();

        mLine = (AlphaOptimizedView) findViewById(R.id.speedbump_line);

    }



    @Override

    protected int getInitialHeight() {

        return mSpeedBumpHeight;

    }



    @Override

    public int getIntrinsicHeight() {

        return mSpeedBumpHeight;

    }



    @Override

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

        mLine.setPivotX(mLine.getWidth() / 2);

        mLine.setPivotY(mLine.getHeight() / 2);

        setOutlineProvider(null);

    }



    @Override

    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {

        measureChildren(widthMeasureSpec, heightMeasureSpec);

        int height = mSpeedBumpHeight;

        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), height);

    }



    @Override

    public boolean isTransparent() {

        return true;

    }



    public void performVisibilityAnimation(boolean nowVisible, long delay) {

        animateDivider(nowVisible, delay, null /* onFinishedRunnable */);

    }



    /**

     * Animate the divider to a new visibility.

     *

     * @param nowVisible should it now be visible

     * @param delay the delay after the animation should start

     * @param onFinishedRunnable A runnable which should be run when the animation is

     *        finished.

     */

    public void animateDivider(boolean nowVisible, long delay, Runnable onFinishedRunnable) {

        if (nowVisible != mIsVisible) {

            // Animate dividers

            float endValue = nowVisible ? 1.0f : 0.0f;

            mLine.animate()

                    .alpha(endValue)

                    .setStartDelay(delay)

                    .scaleX(endValue)

                    .scaleY(endValue)

                    .setInterpolator(mFastOutSlowInInterpolator)

                    .withEndAction(onFinishedRunnable);

            mIsVisible = nowVisible;

        } else {

            if (onFinishedRunnable != null) {

                onFinishedRunnable.run();

            }

        }

    }



    public void setInvisible() {

        mLine.setAlpha(0.0f);

        mLine.setScaleX(0.0f);

        mLine.setScaleY(0.0f);

        mIsVisible = false;

    }



    @Override

    public void performRemoveAnimation(long duration, float translationDirection,

            Runnable onFinishedRunnable) {

        // TODO: Use duration

        performVisibilityAnimation(false, 0 /* delay */);

    }



    @Override

    public void performAddAnimation(long delay, long duration) {

        // TODO: Use duration

        performVisibilityAnimation(true, delay);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+2 −4
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ import android.view.animation.LinearInterpolator; 
import android.view.animation.PathInterpolator;

import android.widget.ImageView;

import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.statusbar.NotificationVisibility;

import com.android.internal.statusbar.StatusBarIcon;
@@ -131,7 +132,6 @@ import com.android.systemui.statusbar.NotificationOverflowContainer; 
import com.android.systemui.statusbar.RemoteInputController;

import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.SignalClusterView;

import com.android.systemui.statusbar.SpeedBumpView;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.phone.UnlockMethodCache.OnUnlockMethodChangedListener;

import com.android.systemui.statusbar.policy.AccessibilityController;
@@ -744,9 +744,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mKeyguardIconOverflowContainer.setOnClickListener(mOverflowClickListener);

        mStackScroller.setOverflowContainer(mKeyguardIconOverflowContainer);



        SpeedBumpView speedBump = (SpeedBumpView) LayoutInflater.from(mContext).inflate(

                        R.layout.status_bar_notification_speed_bump, mStackScroller, false);

        mStackScroller.setSpeedBumpView(speedBump);



        mEmptyShadeView = (EmptyShadeView) LayoutInflater.from(mContext).inflate(

                R.layout.status_bar_no_notifications, mStackScroller, false);

        mStackScroller.setEmptyShadeView(mEmptyShadeView);

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+2 −39
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.systemui.statusbar.EmptyShadeView; 
import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.ExpandableView;

import com.android.systemui.statusbar.NotificationOverflowContainer;

import com.android.systemui.statusbar.SpeedBumpView;

import com.android.systemui.statusbar.StackScrollerDecorView;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.phone.NotificationGroupManager;
@@ -160,7 +159,6 @@ public class NotificationStackScrollLayout extends ViewGroup 
    private boolean mGoToFullShadeNeedsAnimation;

    private boolean mIsExpanded = true;

    private boolean mChildrenUpdateRequested;

    private SpeedBumpView mSpeedBumpView;

    private boolean mIsExpansionChanging;

    private boolean mPanelTracking;

    private boolean mExpandingNotification;
@@ -356,18 +354,6 @@ public class NotificationStackScrollLayout extends ViewGroup 
    }



    public void updateSpeedBumpIndex(int newIndex) {

        int currentIndex = indexOfChild(mSpeedBumpView);



        // If we are currently layouted before the new speed bump index, we have to decrease it.

        boolean validIndex = newIndex > 0;

        if (newIndex > getChildCount() - 1) {

            validIndex = false;

            newIndex = -1;

        }

        if (validIndex && currentIndex != newIndex) {

            changeViewPosition(mSpeedBumpView, newIndex);

        }

        updateSpeedBump(validIndex);

        mAmbientState.setSpeedBumpIndex(newIndex);

    }
@@ -664,8 +650,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        for (int childIdx = 0; childIdx < count; childIdx++) {

            ExpandableView slidingChild = (ExpandableView) getChildAt(childIdx);

            if (slidingChild.getVisibility() == GONE

                    || slidingChild instanceof StackScrollerDecorView

                    || slidingChild == mSpeedBumpView) {

                    || slidingChild instanceof StackScrollerDecorView) {

                continue;

            }

            float childTop = slidingChild.getTranslationY();
@@ -692,8 +677,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        for (int childIdx = 0; childIdx < count; childIdx++) {

            ExpandableView slidingChild = (ExpandableView) getChildAt(childIdx);

            if (slidingChild.getVisibility() == GONE

                    || slidingChild instanceof StackScrollerDecorView

                    || slidingChild == mSpeedBumpView) {

                    || slidingChild instanceof StackScrollerDecorView) {

                continue;

            }

            float childTop = slidingChild.getTranslationY();
@@ -2440,28 +2424,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        runAnimationFinishedRunnables();

    }



    public void setSpeedBumpView(SpeedBumpView speedBumpView) {

        mSpeedBumpView = speedBumpView;

        addView(speedBumpView);

    }



    private void updateSpeedBump(boolean visible) {

        boolean notGoneBefore = mSpeedBumpView.getVisibility() != GONE;

        if (visible != notGoneBefore) {

            int newVisibility = visible ? VISIBLE : GONE;

            mSpeedBumpView.setVisibility(newVisibility);

            if (visible) {

                // Make invisible to ensure that the appear animation is played.

                mSpeedBumpView.setInvisible();

            } else {

                // TODO: This doesn't really work, because the view is already set to GONE above.

                generateRemoveAnimation(mSpeedBumpView);

            }

        }

    }



    public void goToFullShade(long delay) {

        updateSpeedBump(true /* visibility */);

        mDismissView.setInvisible();

        mEmptyShadeView.setInvisible();

        mGoToFullShadeNeedsAnimation = true;

packages/SystemUI/src/com/android/systemui/statusbar/stack/StackScrollState.java

+1 −27
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.systemui.statusbar.DismissView; 
import com.android.systemui.statusbar.EmptyShadeView;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.ExpandableView;

import com.android.systemui.statusbar.SpeedBumpView;



import java.util.HashMap;

import java.util.List;
@@ -107,9 +106,7 @@ public class StackScrollState { 
            if (!applyState(child, state)) {

                continue;

            }

            if(child instanceof SpeedBumpView) {

                performSpeedBumpAnimation(i, (SpeedBumpView) child, state, 0);

            } else if (child instanceof DismissView) {

            if (child instanceof DismissView) {

                DismissView dismissView = (DismissView) child;

                boolean visible = state.topOverLap < mClearAllTopPadding;

                dismissView.performVisibilityAnimation(visible && !dismissView.willBeGone());
@@ -224,27 +221,4 @@ public class StackScrollState { 
            view.setTranslationZ(newZTranslation);

        }

    }



    public void performSpeedBumpAnimation(int i, SpeedBumpView speedBump, StackViewState state,

            long delay) {

        View nextChild = getNextChildNotGone(i);

        if (nextChild != null) {

            float lineEnd = state.yTranslation + state.height / 2;

            StackViewState nextState = getViewStateForView(nextChild);

            boolean startIsAboveNext = nextState.yTranslation > lineEnd;

            speedBump.animateDivider(startIsAboveNext, delay, null /* onFinishedRunnable */);

        }

    }



    private View getNextChildNotGone(int childIndex) {

        int childCount = mHostView.getChildCount();

        for (int i = childIndex + 1; i < childCount; i++) {

            View child = mHostView.getChildAt(i);

            if (child.getVisibility() != View.GONE) {

                return child;

            }

        }

        return null;

    }



}