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

Commit 79934acb authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev

parents 0aa69ff2 face7c17

packages/SystemUI/res/drawable/qs_background_primary.xml

+3 −6
Original line number Diff line number Diff line
@@ -13,11 +13,8 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

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

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

    android:top="@dimen/notification_material_rounded_rect_radius_negative" >

    <solid android:color="@color/system_primary_color" />

    <corners

        android:topLeftRadius="0dp"

        android:topRightRadius="0dp"

        android:bottomLeftRadius="@dimen/notification_material_rounded_rect_radius"

        android:bottomRightRadius="@dimen/notification_material_rounded_rect_radius"/>

    <corners android:radius="@dimen/notification_material_rounded_rect_radius"/>

</shape>

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -358,6 +358,9 @@ 
    <!-- radius of the corners of the material rounded rect background -->

    <dimen name="notification_material_rounded_rect_radius">2dp</dimen>



    <!-- radius of the corners of the material rounded rect background but negative-->

    <dimen name="notification_material_rounded_rect_radius_negative">-2dp</dimen>



    <!-- end margin for multi user switch in expanded quick settings -->

    <dimen name="multi_user_switch_expanded_margin">8dp</dimen>

packages/SystemUI/src/com/android/systemui/qs/QSDetailClipper.java

+0 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ public class QSDetailClipper { 
        if (listener != null) {

            mAnimator.addListener(listener);

        }

        mDetail.setLayerType(View.LAYER_TYPE_HARDWARE, null);

        if (in) {

            mBackground.startTransition((int)(mAnimator.getDuration() * 0.6));

            mAnimator.addListener(mVisibleOnStart);
@@ -82,7 +81,6 @@ public class QSDetailClipper { 
        }



        public void onAnimationEnd(Animator animation) {

            mDetail.setLayerType(View.LAYER_TYPE_NONE, null);

            mAnimator = null;

        }

    };
@@ -90,7 +88,6 @@ public class QSDetailClipper { 
    private final AnimatorListenerAdapter mGoneOnEnd = new AnimatorListenerAdapter() {

        @Override

        public void onAnimationEnd(Animator animation) {

            mDetail.setLayerType(View.LAYER_TYPE_NONE, null);

            mDetail.setVisibility(View.GONE);

            mBackground.resetTransition();

            mAnimator = null;