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

Commit dc40bd77 authored by Danny Epstein's avatar Danny Epstein
Browse files

Add top padding to grant permission content. 

Add top padding to the content inside the scroll view for the grant
permission dialog so that you can read the beginning of the text on
round watches.

Bug: 24961379
Change-Id: I9311fbaabd72bd8f8aee4f71845c1ae11bfeab8c
parent 16bd317a

res/layout-watch/confirmation_dialog.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ 
                android:id="@+id/content"

                android:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="wrap_content">

                android:layout_height="wrap_content"

                android:paddingTop="@dimen/conf_diag_content_padding_top">



            <TextView

                    android:id="@+id/current_page_text"

res/values-round/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
    <dimen name="conf_diag_button_container_height">96dp</dimen>

    <dimen name="conf_diag_2button_margin_side">32dp</dimen>

    <dimen name="conf_diag_2button_margin_top">10dp</dimen>

    <dimen name="conf_diag_content_padding_top">32dp</dimen>



</resources>

res/values-watch/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
    <dimen name="conf_diag_2button_margin_top">9dp</dimen>

    <dimen name="conf_diag_3button_padding_side">32dp</dimen>

    <dimen name="conf_diag_3button_padding_bottom">22dp</dimen>

    <dimen name="conf_diag_content_padding_top">6dp</dimen>





    <!-- START: Ported values -->

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

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ public abstract class ConfirmationViewHandler implements 
        // In order to fake the buttons peeking at the bottom, need to do set the

        // padding properly.

        if (mContent.getPaddingBottom() != mButtonBarContainer.getHeight()) {

            mContent.setPadding(0, 0, 0, mButtonBarContainer.getHeight());

            mContent.setPadding(0, mContent.getPaddingTop(), 0, mButtonBarContainer.getHeight());

            if (Log.isLoggable(TAG, Log.DEBUG)) {

                Log.d(TAG, "    set mContent.PaddingBottom: " + mButtonBarContainer.getHeight());

            }