diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/call_card.xml | 16 | ||||
| -rw-r--r-- | res/layout/dialpad_incall.xml | 1 | ||||
| -rw-r--r-- | res/layout/dtmf_twelve_key_dialer_view.xml | 10 |
3 files changed, 14 insertions, 13 deletions
diff --git a/res/layout/call_card.xml b/res/layout/call_card.xml index 69c9710a..07ecef07 100644 --- a/res/layout/call_card.xml +++ b/res/layout/call_card.xml @@ -20,7 +20,7 @@ android:id="@+id/call_card" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" > <!-- The main content of the CallCard is either one or two "call info" blocks, depending on whether one or two lines are in use. @@ -44,7 +44,8 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical" + android:translationZ="@dimen/primary_call_translation_z" > <include android:id="@+id/primary_call_info" layout="@layout/primary_call_info" /> @@ -79,19 +80,20 @@ </LinearLayout> <FrameLayout - android:layout_width="@dimen/floating_action_button_width" - android:layout_height="@dimen/floating_action_button_height" - android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="bottom|center"> <ImageButton android:id="@+id/endButton" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:layout_marginBottom="@dimen/end_call_button_margin_bottom" android:background="@drawable/floating_end_button_compound_background" android:src="@drawable/ic_in_call_phone_hangup" android:contentDescription="@string/onscreenEndCallText" /> </FrameLayout> + </FrameLayout> <!-- Secondary "Call info" block, for the background ("on hold") call. --> diff --git a/res/layout/dialpad_incall.xml b/res/layout/dialpad_incall.xml index a5ebb825..9d62203a 100644 --- a/res/layout/dialpad_incall.xml +++ b/res/layout/dialpad_incall.xml @@ -24,7 +24,6 @@ android:paddingBottom="@dimen/dialpad_bottom_padding" android:paddingLeft="@dimen/dialpad_horizontal_padding" android:paddingRight="@dimen/dialpad_horizontal_padding" - android:background="@color/background_dialpad" android:stretchColumns="*" android:layoutDirection="ltr" > diff --git a/res/layout/dtmf_twelve_key_dialer_view.xml b/res/layout/dtmf_twelve_key_dialer_view.xml index 6bae3938..fb3b66e9 100644 --- a/res/layout/dtmf_twelve_key_dialer_view.xml +++ b/res/layout/dtmf_twelve_key_dialer_view.xml @@ -20,14 +20,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:layout_marginTop="1dip" > + android:layout_marginTop="1dip" + android:background="@color/incall_dialpad_background" > <view class="com.android.incallui.DialpadFragment$HoverIgnoringLinearLayout" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/background_dialpad"> - + android:layout_height="match_parent" > <!-- Display of the digits you've typed so far. This widget appears completely non-interactive to the user: you @@ -35,6 +34,7 @@ already sent over the network. But it's still an EditText rather than a TextView because it needs to receive key events from a hard keyboard, if present (see mDialerKeyListener). --> + <!-- Edit text background is fully transparent to get rid of its underline. --> <EditText android:id="@+id/dtmfDialerField" android:layout_width="match_parent" @@ -44,13 +44,13 @@ android:layout_marginBottom="5dp" android:layout_marginStart="32dp" android:layout_marginEnd="32dp" + android:background="@null" android:paddingEnd="12dp" android:paddingStart="12dp" android:singleLine="true" android:scrollHorizontally="true" android:gravity="center" android:freezesText="true" - android:background="@color/background_dialpad" android:fontFamily="sans-serif-light" android:textSize="@dimen/dialpad_digits_text_size" android:textColor="@color/dialpad_digits_text_color" |