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

Commit dfe3d610 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Android (Google) Code Review
Browse files

Merge "Introduce dimension of text edit related floating window."

parents 5e0cf4fd eee8941e

core/res/res/layout/floating_popup_container.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:padding="0dp"

    android:layout_margin="20dp"

    android:elevation="2dp"

    android:layout_margin="@android:dimen/text_edit_floating_toolbar_margin"

    android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:background="?attr/floatingToolbarPopupBackgroundDrawable"/>

core/res/res/layout/text_edit_suggestion_container.xml

+2 −2
Original line number Diff line number Diff line
@@ -22,8 +22,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:elevation="2dp"

        android:layout_margin="20dp"

        android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"

        android:layout_margin="@android:dimen/text_edit_floating_toolbar_margin"

        android:background="@drawable/text_edit_suggestions_window"

        android:dropDownSelector="@drawable/list_selector_background"

        android:divider="@null">

core/res/res/layout/text_edit_suggestion_container_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:background="?android:attr/floatingToolbarPopupBackgroundDrawable"

        android:elevation="2dp"

        android:layout_margin="20dp"

        android:elevation="@android:dimen/text_edit_floating_toolbar_elevation"

        android:layout_margin="@android:dimen/text_edit_floating_toolbar_margin"

        android:orientation="vertical"

        android:divider="?android:attr/listDivider"

        android:showDividers="middle">

core/res/res/values/dimens_material.xml

+3 −0
Original line number Diff line number Diff line
@@ -82,6 +82,9 @@ 
    <dimen name="text_size_medium_material">18sp</dimen>

    <dimen name="text_size_small_material">14sp</dimen>



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

    <dimen name="text_edit_floating_toolbar_margin">20dp</dimen>



    <dimen name="floating_window_z">16dp</dimen>

    <dimen name="floating_window_margin_left">16dp</dimen>

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