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

Commit 8898cd05 authored by Yorke Lee's avatar Yorke Lee
Browse files

Removing and renaming classes from Dialer 

* No code was changed, just either removed or renamed
* Reshuffled a couple of ids around in dialpad_fragment to fix some
compile time errors that somehow weren't caught before
Change-Id: I9e2381edfb14b0940015deb8cbd94786a1242f43
parent 243cc857

res/layout-land/dialpad_fragment.xml

+2 −2
Original line number Diff line number Diff line
@@ -84,9 +84,9 @@ 
        <View

            android:layout_width="match_parent"

            android:layout_height="@dimen/dialpad_button_margin"

            android:layout_above="@id/dialButton"

            android:layout_above="@+id/dialButton"

            android:background="#33000000" />

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

        <ImageButton android:id="@id/dialButton"

            android:layout_width="match_parent"

            android:layout_height="@dimen/call_button_height"

            android:layout_alignParentBottom="true"

res/layout/dialpad.xml

+69 −57
Original line number Diff line number Diff line
@@ -26,74 +26,86 @@ 
    android:paddingStart="5dip"

    android:paddingEnd="5dip"

    android:paddingBottom="10dip"

    android:background="@drawable/dialpad_background"

    android:stretchColumns="0,1,2"

    android:layoutDirection="ltr" >



    <TableRow

        android:layout_height="0px"

        android:layout_weight="1">

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/one" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_1_wht"

            android:contentDescription="@string/description_image_button_one" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/two" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_2_wht"

            android:contentDescription="@string/description_image_button_two" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/three" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_3_wht"

            android:contentDescription="@string/description_image_button_three" />

        <com.android.dialer.dialpad.DialpadKeyButton

            xmlns:android="http://schemas.android.com/apk/res/android"

            android:id="@+id/one"

            style="@style/DialtactsDialpadButtonStyle"

            android:clickable="true" >

            <TextView

                android:id="@+id/dialpad_key_number"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textColor="@color/dialpad_primary_text_color"

                android:textSize="@dimen/dialpad_key_numbers_size"

                android:fontFamily="sans-serif-light"

                android:layout_centerInParent="true" />

            <ImageView

                android:id="@+id/dialpad_key_voicemail"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:src="@drawable/ic_dial_action_vm"

                android:paddingRight="11dp"

                android:layout_alignBaseline="@id/dialpad_key_number"

                android:baselineAlignBottom="true"

                android:layout_alignParentRight="true" />

        </com.android.dialer.dialpad.DialpadKeyButton>

        <include layout="@layout/dialpad_key" android:id="@+id/two"/>

        <include layout="@layout/dialpad_key" android:id="@+id/three"/>

    </TableRow>



    <TableRow

        android:layout_height="0px"

        android:layout_weight="1">

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/four" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_4_wht"

            android:contentDescription="@string/description_image_button_four" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/five" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_5_wht"

            android:contentDescription="@string/description_image_button_five" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/six" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_6_wht"

            android:contentDescription="@string/description_image_button_six" />

        <include layout="@layout/dialpad_key" android:id="@+id/four"/>

        <include layout="@layout/dialpad_key" android:id="@+id/five"/>

        <include layout="@layout/dialpad_key" android:id="@+id/six"/>

    </TableRow>



    <TableRow

        android:layout_height="0px"

        android:layout_weight="1">

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/seven" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_7_wht"

            android:contentDescription="@string/description_image_button_seven" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/eight" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_8_wht"

            android:contentDescription="@string/description_image_button_eight" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/nine" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_9_wht"

            android:contentDescription="@string/description_image_button_nine" />

        <include layout="@layout/dialpad_key" android:id="@+id/seven"/>

        <include layout="@layout/dialpad_key" android:id="@+id/eight"/>

        <include layout="@layout/dialpad_key" android:id="@+id/nine"/>

    </TableRow>



    <TableRow

        android:layout_height="0px"

        android:layout_weight="1">

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/star" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_star_wht"

            android:contentDescription="@string/description_image_button_star" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/zero" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_0_wht"

            android:contentDescription="@string/description_image_button_zero" />

        <com.android.dialer.dialpad.DialpadImageButton

            android:id="@+id/pound" style="@style/DialtactsDialpadButtonStyle"

            android:src="@drawable/dial_num_pound_wht"

            android:contentDescription="@string/description_image_button_pound" />

        <com.android.dialer.dialpad.DialpadKeyButton

            xmlns:android="http://schemas.android.com/apk/res/android"

            android:id="@+id/star"

            style="@style/DialtactsDialpadButtonStyle"

            android:clickable="true" >

            <TextView

                android:id="@id/dialpad_key_number"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textColor="@color/dialpad_secondary_text_color"

                android:textSize="@dimen/dialpad_key_special_characters_size"

                android:fontFamily="sans-serif-light"

                android:layout_centerInParent="true" />

        </com.android.dialer.dialpad.DialpadKeyButton>

        <include layout="@layout/dialpad_key" android:id="@+id/zero"/>

        <com.android.dialer.dialpad.DialpadKeyButton

            xmlns:android="http://schemas.android.com/apk/res/android"

            android:id="@+id/pound"

            style="@style/DialtactsDialpadButtonStyle"

            android:clickable="true" >

            <TextView

                android:id="@id/dialpad_key_number"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textColor="@color/dialpad_secondary_text_color"

                android:textSize="@dimen/dialpad_key_special_characters_size"

                android:fontFamily="sans-serif-light"

                android:layout_centerInParent="true" />

        </com.android.dialer.dialpad.DialpadKeyButton>

    </TableRow>

</TableLayout>

res/layout/dialpad_fragment.xml

+92 −90
Original line number Diff line number Diff line
@@ -13,15 +13,27 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/top"

<view class="com.android.dialer.dialpad.DialpadFragment$DialpadSlidingLinearLayout"

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical" >

    <!-- spacer view -->

    <Space

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="1" />

    <LinearLayout

        android:id="@+id/top"

        android:layout_width="match_parent"

        android:layout_height="0dp"

        android:layout_weight="2"

        android:orientation="vertical"

        android:paddingStart="@dimen/dialpad_horizontal_margin"

        android:paddingEnd="@dimen/dialpad_horizontal_margin"

    android:layoutDirection="ltr" >

        android:layoutDirection="ltr"

        android:background="@color/background_dialpad" >





        <!-- Text field and possibly soft menu button above the keypad where

             the digits are displayed. -->
@@ -29,10 +41,9 @@ 
            android:id="@+id/digits_container"

            android:layout_width="match_parent"

            android:layout_height="0px"

        android:layout_weight="@integer/dialpad_layout_weight_digits"

            android:layout_weight="@integer/dialpad_layout_weight_digits_new"

            android:layout_marginTop="@dimen/dialpad_vertical_margin"

        android:gravity="center"

        android:background="@drawable/dialpad_background" >

            android:gravity="center" >



            <com.android.dialer.dialpad.DigitsEditText

                android:id="@+id/digits"
@@ -41,7 +52,7 @@ 
                android:layout_height="match_parent"

                android:gravity="center"

                android:textAppearance="@style/DialtactsDigitsTextAppearance"

            android:textColor="?android:attr/textColorPrimary"

                android:textColor="@color/dialpad_text_color"

                android:nextFocusRight="@+id/overflow_menu"

                android:background="@android:color/transparent" />
@@ -57,55 +68,45 @@ 
                android:src="@drawable/ic_dial_action_delete" />

        </LinearLayout>



    <!-- Smart dial suggestion section.

         sp is used here for this layout instead of dp in order for it to resize as

         appropriate when the font size increases. This is a one-time exception that is

         ok in this case because there is space for the suggestion strip to expand. -->

    <RelativeLayout

        android:id="@+id/dialpad_smartdial_container"

        android:layout_width="match_parent"

        android:layout_height="50sp"

        android:layout_marginTop="@dimen/dialpad_vertical_margin">

        <View

            android:id="@+id/dialpad_smartdial_list_background"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="@drawable/dialpad_background">

        </View>

        <LinearLayout

            android:id="@+id/dialpad_smartdial_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="horizontal"

            android:gravity="center">

        </LinearLayout>

    </RelativeLayout>



        <!-- Keypad section -->

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



        <View style="@style/DialpadHorizontalSeparator"/>



    <!-- left and right paddings will be modified by the code. See DialpadFragment. -->

    <FrameLayout

        <LinearLayout

            android:id="@+id/dialButtonContainer"

            android:layout_width="match_parent"

            android:layout_height="0px"

            android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"

            android:layout_gravity="center_horizontal"

        android:background="@drawable/dialpad_background">



            android:background="@color/dialpad_primary_text_color">

            <ImageButton

                android:id="@+id/call_history_on_dialpad_button"

                android:layout_height="@dimen/fake_action_bar_height"

                android:layout_width="@dimen/fake_menu_button_min_width"

                android:layout_gravity="bottom|start"

                android:background="@drawable/btn_call"

                android:contentDescription="@string/action_menu_call_history_description"

                android:src="@drawable/ic_menu_history_lt"/>

            <ImageButton

                android:id="@+id/dialButton"

            android:layout_width="match_parent"

                android:layout_width="0dp"

                android:layout_weight="1"

                android:layout_height="match_parent"

                android:layout_gravity="center"

                android:state_enabled="false"

                android:background="@drawable/btn_call"

                android:contentDescription="@string/description_dial_button"

                android:src="@drawable/ic_dial_action_call" />



    </FrameLayout>

            <ImageButton

                android:id="@+id/overflow_menu_on_dialpad"

                android:layout_height="@dimen/fake_action_bar_height"

                android:layout_width="@dimen/fake_menu_button_min_width"

                android:layout_gravity="bottom|end"

                android:background="@drawable/btn_call"

                android:src="@drawable/ic_menu_overflow_lt"

                android:contentDescription="@string/action_menu_overflow_description" />

        </LinearLayout>



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

             Dialer while a call is already in progress.
@@ -118,3 +119,4 @@ 
        />



    </LinearLayout>

</view>

res/layout/dialpad_smartdial_item.xml

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:orientation="vertical"

    android:layout_width="0dp"

    android:layout_weight="1"

    android:layout_height="match_parent"

    android:layout_marginTop="2dp"

    android:layout_marginBottom="2dp"

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



    <com.android.dialer.dialpad.SmartDialTextView

        android:id="@+id/contact_name"

        android:layout_width="match_parent"

        android:layout_height="28sp"

        android:padding="@dimen/smartdial_suggestions_padding"

        android:textColor="@color/smartdial_name_primary_text_color"

        android:textSize="16sp"

        android:singleLine="true"

        android:ellipsize="none"

        android:gravity="center"

    />

    <com.android.dialer.dialpad.SmartDialTextView

        android:id="@+id/contact_number"

        android:layout_width="match_parent"

        android:layout_height="16sp"

        android:textColor="@color/smartdial_number_primary_text_color"

        android:textSize="13sp"

        android:gravity="center"

    />

</LinearLayout>

res/layout/dialtacts_activity.xml

+59 −28
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2006 The Android Open Source Project

<!-- Copyright (C) 2013 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -13,35 +13,66 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

<FrameLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_marginTop="?android:attr/actionBarSize"

    android:id="@+id/dialtacts_frame"

    android:focusable="true"

    android:focusableInTouchMode="true"

    android:clipChildren="false"

    android:id="@+id/dialtacts_container"

    >

    <android.support.v4.view.ViewPager

        android:id="@+id/pager"

    <!-- Overlapping dialpad fragment is inserted here -->

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



    <ImageButton

         android:id="@+id/searchButton"

         android:layout_width="wrap_content"

         android:layout_height="?android:attr/actionBarSize"

         android:layout_gravity="bottom|start"

         android:state_enabled="false"

        android:layout_height="match_parent"

        android:clipChildren="false"

        android:orientation="vertical" >

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:paddingLeft="16dp"

            android:paddingRight="23dp"

            android:id="@+id/search_view_container"

            android:background="@color/searchbox_background_color"

            android:orientation="horizontal"

            android:gravity="center_vertical">

            <EditText

                android:id="@+id/search_view"

                android:layout_width="0dp"

                android:layout_height="56dp"

                android:layout_weight="1"

                android:inputType="textFilter"/>

            <ImageView

                android:id="@+id/search_close_button"

                android:layout_height="40dp"

                android:layout_width="40dp"

                android:padding="6dp"

                android:src="@drawable/ic_close_dk"

                android:clickable="true"

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

         android:contentDescription="@string/description_search_button"

         android:src="@drawable/ic_dial_action_search"/>



    <ImageButton

         android:id="@+id/overflow_menu"

         android:layout_width="wrap_content"

         android:layout_height="?android:attr/actionBarSize"

         android:layout_gravity="bottom|end"

         android:src="@drawable/ic_menu_overflow"

         android:contentDescription="@string/action_menu_overflow_description"

         android:nextFocusLeft="@id/digits"

                android:visibility="gone" />

            <ImageView

                android:id="@+id/voice_search_button"

                android:layout_height="40dp"

                android:layout_width="40dp"

                android:padding="6dp"

                android:src="@drawable/ic_voice_search"

                android:clickable="true"

                android:contentDescription="@string/description_start_voice_search"

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

        </LinearLayout>

        <FrameLayout

            android:layout_height="0dp"

            android:layout_weight="1"

            android:layout_width="match_parent"

            android:id="@+id/dialtacts_frame"

            android:clipChildren="false">

        </FrameLayout>

        <View

            android:id="@+id/dialtacts_bottom_padding"

            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"

            android:visibility="gone" />

    </LinearLayout>

</FrameLayout>