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

Commit da4e4832 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I1cde5dd0 into eclair 

* changes:
  In landscape mode, set the type of digit area to PHONE[do not merge].
parents 4bef56bd 901f8568

res/layout-finger/twelve_key_dialer.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 
    android:orientation="vertical"

>



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

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

         It's type is set to NULL (to disable the IME keyboard) in the

         java code.

    -->

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

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

        android:layout_width="fill_parent"

res/layout-land-finger/twelve_key_dialer.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 
    android:orientation="vertical"

>



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

    <!-- 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="fill_parent"

res/layout-long-finger/twelve_key_dialer.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 
    android:orientation="vertical"

>



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

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

         It's type is set to NULL (to disable the IME keyboard) in the

         java code.

    -->

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

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

        android:layout_width="fill_parent"

res/layout-long-land-finger/twelve_key_dialer.xml

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 
    android:orientation="vertical"

>



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

    <!-- 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="fill_parent"

src/com/android/contacts/TwelveKeyDialer.java

+10 −2
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener, 
        mDigits.setKeyListener(DialerKeyListener.getInstance());

        mDigits.setOnClickListener(this);

        mDigits.setOnKeyListener(this);

        mDigits.setInputType(android.text.InputType.TYPE_NULL);  // Don't show IME when focused.



        maybeAddNumberFormatting();
@@ -214,7 +213,16 @@ public class TwelveKeyDialer extends Activity implements View.OnClickListener, 
        view.setOnLongClickListener(this);

        mDelete = view;



        mDialpad = findViewById(R.id.dialpad);  // This is null in landscape mode

        mDialpad = findViewById(R.id.dialpad);  // This is null in landscape mode.



        // In landscape we put the keyboard in phone mode.

        // In portrait we prevent the soft keyboard to show since the

        // dialpad acts as one already.

        if (null == mDialpad) {

            mDigits.setInputType(android.text.InputType.TYPE_CLASS_PHONE);

        } else {

            mDigits.setInputType(android.text.InputType.TYPE_NULL);

        }



        // Set up the "dialpad chooser" UI; see showDialpadChooser().

        mDialpadChooser = (ListView) findViewById(R.id.dialpadChooser);