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

Commit 98b85f49 authored by Andrew Lee's avatar Andrew Lee
Browse files

Update dialpad according to redlines. 

- Shift most keys down 8dp.
- Add separator line.
- Change (entered) digits color.
- Update margin/padding around entered digits.
- Adjust symbol positioning.

Bug: 15328499
Change-Id: Ie653b30b290b20d9426f4edca75d91df7c781861
parent c203d939

res-common/layout/dialpad_view.xml

+15 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:id="@+id/digits_container"

        android:layout_width="match_parent"

        android:layout_height="@dimen/dialpad_digits_height"

        android:layout_marginBottom="@dimen/dialpad_digits_margin_bottom"

        android:orientation="horizontal">



        <ImageButton android:id="@+id/dialpad_overflow"
@@ -76,6 +77,20 @@ 
            android:src="@drawable/ic_dialpad_delete" />

    </LinearLayout>



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="#d6d6d6" />



    <View

        android:layout_width="match_parent"

        android:layout_height="1dp"

        android:background="#ffffff" />



    <Space

        android:layout_width="match_parent"

        android:layout_height="8dp" />



    <include layout="@layout/dialpad" />



    <Space

res-common/values/colors.xml

+2 −3
Original line number Diff line number Diff line
@@ -85,12 +85,11 @@ 
    <color name="actionbar_unselected_text_color">#a6ffffff</color>



    <!-- Colors for the dialpad -->

    <color name="background_dialpad">#ffffff</color>

    <color name="background_dialpad">#fcfcfc</color>

    <color name="background_dialpad_pressed">#ececec</color>

    <color name="dialpad_primary_text_color">#26c6da</color>

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

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

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

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

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

    <color name="dialpad_icon_tint">#b3b3b3</color>

</resources>

res-common/values/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -115,13 +115,14 @@ 
    <dimen name="dialpad_key_star_pound_size">23sp</dimen>

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

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

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

    <dimen name="dialpad_symbol_margin_bottom">13dp</dimen>

    <!-- The bottom row of the dialpad is slightly taller to account for the dial button -->

    <dimen name="dialpad_bottom_key_height">72dp</dimen>

    <dimen name="dialpad_bottom_key_height">65dp</dimen>

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

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

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

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

    <dimen name="dialpad_digits_margin_bottom">22dp</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>

res-common/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar 
        <item name="android:textSize">@dimen/dialpad_key_star_pound_size</item>

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

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

        <item name="android:layout_marginBottom">@dimen/dialpad_subtext_height</item>

        <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item>

        <item name="android:gravity">center</item>

    </style>