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

Commit 639283b4 authored by Vinod Krishnan's avatar Vinod Krishnan
Browse files

MNC Perms: Button bar animate to max half window height 

- Make sure that the button bar only animates to half way (max).
- Also make the buttons scrollable

Bug: 24265941
Bug: 24208967

Change-Id: I68d01c72658c0e7aff35b899b638da123c44d62e
parent fb9be671

res/values-watch/themes.xml

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
        <item name="android:maxLines">3</item>

        <item name="android:ellipsize">marquee</item>

        <item name="android:layout_height">60dp</item>

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_width">wrap_content</item>

        <item name="android:drawablePadding">12dp</item>

    </style>

</resources>

src/com/android/packageinstaller/permission/ui/wear/ConfirmationViewHandler.java

+9 −3
Original line number Diff line number Diff line
@@ -182,8 +182,14 @@ public abstract class ConfirmationViewHandler implements 
                        if (mContent.getHeight() > mScrollingContainer.getHeight()) {

                            mButtonBarContainer.setTranslationZ(mButtonBarFloatingHeight);

                            mHideHandler.sendEmptyMessageDelayed(MSG_HIDE_BUTTON_BAR, 3000);

                            generateButtonBarAnimator(mButtonBarContainer.getHeight(), 0, 0,

                                    mButtonBarFloatingHeight, 1000);

                            int maxButtonBarHeight = 0;

                            if (mButtonBarContainer.getHeight() >= mRoot.getHeight() / 2) {

                                // If the ButtonBar is bigger than half the screen, then don't

                                // animate all the way.

                                maxButtonBarHeight = mRoot.getHeight() / 2;

                            }

                            generateButtonBarAnimator(mButtonBarContainer.getHeight(),

                                    maxButtonBarHeight, 0, mButtonBarFloatingHeight, 1000);

                        } else {

                            mButtonBarContainer.setTranslationY(0);

                            mButtonBarContainer.setTranslationZ(0);