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

Commit 29c0fb72 authored by Andrew Lee's avatar Andrew Lee
Browse files

Move more menu to top, and resize digits text. 

- Move the overflow menu to the top in the layout.
- Remove the add contacts button from the layout.
- Change DigitsEditText to dynamically resize text to fit.
- Style Digit text area to redlines.
- Add accessor for the overflow button in the DialpadView.

Bug: 14471388
Change-Id: I9ab875a5d9ff0b43233e5d8595eb7206dc7b7dab
parent c78eb4ba

res-common/layout/dialpad.xml

+2 −25
Original line number Diff line number Diff line
@@ -125,30 +125,7 @@ 
        </com.android.contacts.common.dialpad.DialpadKeyButton>

        <Space style="@style/DialpadSpaceStyle" />

    </LinearLayout>



    <LinearLayout

    <Space

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal">

        <FrameLayout

            android:id="@+id/dialpad_add_contact"

            android:contentDescription="@string/description_add_contact"

            style="@style/DialpadBottomKeyButtonStyle"

            android:visibility="invisible" >

            <ImageView

                android:src="@drawable/ic_add_person_dk"

                android:importantForAccessibility="no"

                style="@style/DialpadKeyInternalLayoutStyle" />

        </FrameLayout>

        <Space style="@style/DialpadBottomKeyButtonStyle" />

        <FrameLayout

            android:id="@+id/dialpad_overflow"

            android:contentDescription="@string/description_dialpad_overflow"

            style="@style/DialpadBottomKeyButtonStyle" >

            <ImageView

                android:src="@drawable/ic_overflow_menu"

                android:importantForAccessibility="no"

                style="@style/DialpadKeyInternalLayoutStyle" />

        </FrameLayout>

    </LinearLayout>

        android:layout_height="@dimen/dialpad_bottom_key_height" />

</LinearLayout>

res-common/layout/dialpad_view.xml

+10 −1
Original line number Diff line number Diff line
@@ -32,11 +32,20 @@ 
        android:layout_height="@dimen/dialpad_digits_height"

        android:orientation="horizontal">



        <ImageButton android:id="@+id/dialpad_overflow"

            android:background="@drawable/btn_dialpad_key"

            android:src="@drawable/ic_overflow_menu"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:paddingLeft="@dimen/dialpad_digits_padding"

            android:paddingRight="@dimen/dialpad_digits_menu_right_padding"

            android:contentDescription="@string/description_dialpad_overflow"

            android:gravity="center" />



        <view class="com.android.contacts.common.dialpad.DigitsEditText"

            android:id="@+id/digits"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:paddingLeft="@dimen/dialpad_digits_padding"

            android:scrollHorizontally="true"

            android:singleLine="true"

            android:layout_weight="1"

res-common/values/colors.xml

+2 −1
Original line number Diff line number Diff line
@@ -86,7 +86,8 @@ 
    <color name="dialpad_primary_text_color">#26c6da</color>

    <!-- Secondary color of dialpad text; black at 40% opacity. -->

    <color name="dialpad_secondary_text_color">#66000000</color>

    <color name="dialpad_digits_text_color">#000000</color>

    <!-- 75% opacity, black. -->

    <color name="dialpad_digits_text_color">#bf000000</color>

    <color name="dialpad_separator_line_color">#dadada</color>

    <!-- 35% opacity, black. -->

    <color name="dialpad_touch_tint">#59000000</color>

res-common/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -112,9 +112,10 @@ 
    <dimen name="dialpad_bottom_key_height">72dp</dimen>

    <dimen name="dialpad_key_plus_size">18sp</dimen>

    <dimen name="dialpad_horizontal_padding">5dp</dimen>

    <dimen name="dialpad_digits_text_size">33dp</dimen>

    <dimen name="dialpad_digits_text_size">36dp</dimen>

    <dimen name="dialpad_digits_height">64dp</dimen>

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

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

    <dimen name="dialpad_digits_margin_bottom">0px</dimen>

    <dimen name="dialpad_center_margin">3dp</dimen>

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