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

Commit 29c5d83b authored by Adam Shanks's avatar Adam Shanks
Browse files

Much better fix for keyboard FC, added landscape dialer layout from Eclair.

parent 7a0f84f8

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:icon="@drawable/ic_launcher_phone"

            android:screenOrientation="portrait"

            android:screenOrientation="nosensor"

        >

            <intent-filter>

                <action android:name="android.intent.action.DIAL" />

res/layout-land-finger/twelve_key_dialer.xml

+21 −36
Original line number Diff line number Diff line
@@ -21,44 +21,29 @@ 
    android:layout_height="fill_parent"

    android:orientation="vertical"

>

    <LinearLayout android:id="@+id/digitsAndBackspace"

        android:layout_width="fill_parent"

        android:layout_height="66px"

        android:addStatesFromChildren="true"

        android:gravity="center_vertical"

        android:baselineAligned="false"

        android:layout_marginTop="3px"

        android:layout_marginBottom="5px"

        android:layout_marginLeft="3px"

        android:layout_marginRight="3px"

    >



    <!-- Text field above the keypad where the digits are displayed.

         It's type is set to PHONE (to put the keyboard in the right

         config) in the java code.

    -->

    <!-- TODO: Use a textAppearance to control the display of the number -->

    <EditText android:id="@+id/digits"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_height="66px"

        android:layout_width="fill_parent"

        android:layout_height="65dip"

        android:layout_marginBottom="50dip"

        android:layout_marginTop="1dip"

        android:gravity="center"

        android:maxLines="1"

        android:scrollHorizontally="true"

            android:textSize="28sp"

        android:textSize="33sp"

        android:freezesText="true"

        android:background="@drawable/btn_dial_textfield"

        android:textColor="@color/dialer_button_text"

        android:hint="@string/dialerKeyboardHintText"

     />



        <!--

            The button goes at the right.

        -->

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

            style="@android:style/Widget.Button.Inset"

            android:src="@drawable/ic_delete_phone_number"

            android:layout_width="wrap_content"

            android:layout_height="66px"

            android:background="@drawable/btn_dial_delete"

            android:gravity="center"

        />



    </LinearLayout>

    <!-- Horizontal row of buttons (Voicemail + DialButton + Delete.) -->

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



    <!-- "Dialpad chooser" UI, shown only when the user brings up the

         Dialer while a call is already in progress.

src/com/android/contacts/TwelveKeyDialer.java

+4 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.res.Resources;

import android.content.ComponentName;

import android.content.pm.ActivityInfo;

import android.database.Cursor;

import android.graphics.Bitmap;

import android.graphics.BitmapFactory;
@@ -170,6 +171,7 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener, 
        mDigits.setKeyListener(DialerKeyListener.getInstance());

        mDigits.setOnClickListener(this);

        mDigits.setOnKeyListener(this);

        mDigits.setCursorVisible(false);

        maybeAddNumberFormatting();



        // Check for the presence of the keypad