diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/call_button_fragment.xml | 31 | ||||
| -rw-r--r-- | res/layout/conference_manager_fragment.xml | 1 | ||||
| -rw-r--r-- | res/layout/dialpad_incall.xml | 79 | ||||
| -rw-r--r-- | res/layout/dialpad_key_incall.xml | 34 | ||||
| -rw-r--r-- | res/layout/dtmf_twelve_key_dialer_view.xml | 137 | ||||
| -rw-r--r-- | res/layout/incall_screen.xml | 42 | ||||
| -rw-r--r-- | res/layout/incall_screen_msim.xml | 42 | ||||
| -rw-r--r-- | res/layout/primary_call_info.xml | 7 |
8 files changed, 213 insertions, 160 deletions
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml index ef9beb5c..a67ff0f8 100644 --- a/res/layout/call_button_fragment.xml +++ b/res/layout/call_button_fragment.xml @@ -36,6 +36,9 @@ android:id="@+id/bottomButtons" android:orientation="vertical" android:layout_width="match_parent" + android:background="#0000ff" + android:layout_margin="0dp" + android:padding="0dp" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:visibility="invisible"> @@ -54,7 +57,6 @@ <ImageButton android:id="@+id/endButton" style="@style/InCallEndButton" android:layout_width="match_parent" - android:layout_marginTop="2dp" android:src="@drawable/ic_in_call_phone_hangup" android:background="@drawable/end_call_background" android:contentDescription="@string/onscreenEndCallText"/> @@ -166,19 +168,6 @@ android:contentDescription="@string/onscreenMergeCallsText" android:visibility="gone" /> - - <!-- Separator between 3rd (or 4th) and 4th (or 6th) button --> - <View android:id="@+id/blacklistSpacer" - style="@style/VerticalSeparator" /> - - <!-- "Blacklist" --> - <!-- The button used for toggling blackist. --> - <ImageButton android:id="@+id/addBlacklistButton" - style="@style/InCallButton" - android:src="@drawable/ic_block_contact_holo_dark" - android:contentDescription="@string/onscreenBlacklistText" - /> - <!-- Separator between 5th (or 6th) button and right padding --> <View style="@style/VerticalSeparator" /> @@ -188,8 +177,6 @@ android:contentDescription="@string/onscreenAddParticipant" /> - - <!-- Separator between 5th (or 6th) button and right padding --> <View style="@style/VerticalSeparator" /> <ImageButton android:id="@+id/modifyCallButton" @@ -198,6 +185,18 @@ android:contentDescription="@string/onscreenModifyCallText" /> + <!-- Separator between 3rd (or 4th) and 4th (or 6th) button --> + <View android:id="@+id/blacklistSpacer" + style="@style/VerticalSeparator" /> + + <!-- "Blacklist" --> + <!-- The button used for toggling blackist. --> + <ImageButton android:id="@+id/addBlacklistButton" + style="@style/InCallButton" + android:src="@drawable/ic_block_contact_holo_dark" + android:contentDescription="@string/onscreenBlacklistText" + /> + <!-- Separator between 4th (or 5th) button and right padding --> <View style="@style/VerticalSeparator" /> diff --git a/res/layout/conference_manager_fragment.xml b/res/layout/conference_manager_fragment.xml index a8fda2c2..983b795c 100644 --- a/res/layout/conference_manager_fragment.xml +++ b/res/layout/conference_manager_fragment.xml @@ -23,6 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" + android:fitsSystemWindows="true" > <!-- This original header (with timer) is currently not being used, but may be of use in the future. --> diff --git a/res/layout/dialpad_incall.xml b/res/layout/dialpad_incall.xml new file mode 100644 index 00000000..d9473c1c --- /dev/null +++ b/res/layout/dialpad_incall.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<TableLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/dialpad" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="4" + android:layout_gravity="center_horizontal" + android:paddingLeft="@dimen/dialpad_horizontal_padding" + android:paddingRight="@dimen/dialpad_horizontal_padding" + android:background="@color/background_dialpad" + android:stretchColumns="*" + android:layoutDirection="ltr" > + + <TableRow style="@style/InCallDialpadTableRowStyle"> + <include layout="@layout/dialpad_key_incall" android:id="@+id/one"/> + <include layout="@layout/dialpad_key_incall" android:id="@+id/two"/> + <include layout="@layout/dialpad_key_incall" android:id="@+id/three"/> + </TableRow> + + <TableRow style="@style/InCallDialpadTableRowStyle"> + <include layout="@layout/dialpad_key_incall" android:id="@+id/four"/> + <include layout="@layout/dialpad_key_incall" android:id="@+id/five"/> + <include layout="@layout/dialpad_key_incall" android:id="@+id/six"/> + </TableRow> + + <TableRow style="@style/InCallDialpadTableRowStyle"> + <include layout="@layout/dialpad_key_incall" android:id="@+id/seven"/> + <include layout="@layout/dialpad_key_incall" android:id="@+id/eight"/> + <include layout="@layout/dialpad_key_incall" android:id="@+id/nine"/> + </TableRow> + + <TableRow style="@style/InCallDialpadTableRowStyle"> + <com.android.dialer.dialpad.DialpadKeyButton + android:id="@+id/star" + style="@style/InCallDialpadKeyButtonStyle"> + <LinearLayout + style="@style/InCallDialpadKeyInternalLayoutStyle"> + <TextView + android:id="@+id/dialpad_key_number" + style="@style/InCallDialpadKeyStarPoundStyle" + android:textSize="@dimen/dialpad_key_star_size" /> + <View + android:layout_height="match_parent" + android:layout_width="@dimen/dialpad_key_letters_width" /> + </LinearLayout> + </com.android.dialer.dialpad.DialpadKeyButton> + <include layout="@layout/dialpad_key_incall" android:id="@+id/zero"/> + <com.android.dialer.dialpad.DialpadKeyButton + android:id="@+id/pound" + style="@style/InCallDialpadKeyButtonStyle"> + <LinearLayout + style="@style/InCallDialpadKeyInternalLayoutStyle"> + <TextView + android:id="@+id/dialpad_key_number" + style="@style/InCallDialpadKeyStarPoundStyle" + android:textSize="@dimen/dialpad_key_pound_size" /> + <View + android:layout_height="match_parent" + android:layout_width="@dimen/dialpad_key_letters_width" /> + </LinearLayout> + </com.android.dialer.dialpad.DialpadKeyButton> + </TableRow> +</TableLayout> diff --git a/res/layout/dialpad_key_incall.xml b/res/layout/dialpad_key_incall.xml new file mode 100644 index 00000000..8ce4b513 --- /dev/null +++ b/res/layout/dialpad_key_incall.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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. +--> + +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + style="@style/InCallDialpadKeyButtonStyle"> + + <LinearLayout style="@style/InCallDialpadKeyInternalLayoutStyle"> + + <!-- Note in the referenced styles that we assign hard widths to these components + because we want them to line up vertically when we arrange them in an MxN grid --> + + <TextView + android:id="@+id/dialpad_key_number" + style="@style/InCallDialpadKeyNumberStyle" /> + + <TextView + android:id="@+id/dialpad_key_letters" + style="@style/InCallDialpadKeyLettersStyle" /> + </LinearLayout> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/dtmf_twelve_key_dialer_view.xml b/res/layout/dtmf_twelve_key_dialer_view.xml index fe84010c..9ff7142e 100644 --- a/res/layout/dtmf_twelve_key_dialer_view.xml +++ b/res/layout/dtmf_twelve_key_dialer_view.xml @@ -14,109 +14,50 @@ limitations under the License. --> -<!-- The grid of buttons used in the onscreen DTMF dialpad; - see dtmf_twelve_key_dialer_view.xml. --> -<LinearLayout +<view class="com.android.incallui.DialpadFragment$DialpadSlidingLinearLayout" xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/dtmf_twelve_key_dialer_view" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:layout_marginTop="1dip" > + android:layout_marginTop="1dip" + android:background="@color/background_dialpad" > - <!-- Display of the digits you've typed so far. - This widget appears completely non-interactive to the user: you - can't edit or "hit backspace" since these are DTMF tones you've - 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). --> - <EditText - android:id="@+id/dtmfDialerField" - android:layout_width="match_parent" - android:layout_height="32dp" - android:layout_marginTop="10dp" - android:layout_marginBottom="5dp" - android:layout_marginStart="32dp" - android:layout_marginEnd="32dp" - android:paddingEnd="16dp" - android:paddingStart="16dp" - android:singleLine="true" - android:scrollHorizontally="true" - android:textSize="24sp" - android:gravity="center" - android:freezesText="true" - android:background="@null" - android:textColor="@color/dtmf_dialer_display_text" - android:focusableInTouchMode="false" - android:clickable="false"/> - - <TableLayout - android:id="@+id/dialpad" + <view class="com.android.incallui.DialpadFragment$HoverIgnoringLinearLayout" + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_weight="@integer/dialpad_layout_weight_dialpad" - android:layout_gravity="center_horizontal" - android:layout_marginTop="@dimen/dialpad_vertical_margin" - android:paddingStart="5dip" - android:paddingEnd="5dip" - android:paddingBottom="10dip" - android:background="@color/dialpad_background" - android:layoutDirection="ltr"> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/one" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_1_no_vm_wht" - android:contentDescription="@string/description_image_button_one" /> - <ImageButton android:id="@+id/two" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_2_wht" - android:contentDescription="@string/description_image_button_two" /> - <ImageButton android:id="@+id/three" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_3_wht" - android:contentDescription="@string/description_image_button_three" /> - </TableRow> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/four" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_4_wht" - android:contentDescription="@string/description_image_button_four" /> - <ImageButton android:id="@+id/five" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_5_wht" - android:contentDescription="@string/description_image_button_five" /> - <ImageButton android:id="@+id/six" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_6_wht" - android:contentDescription="@string/description_image_button_six" /> - </TableRow> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/seven" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_7_wht" - android:contentDescription="@string/description_image_button_seven" /> - <ImageButton android:id="@+id/eight" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_8_wht" - android:contentDescription="@string/description_image_button_eight" /> - <ImageButton android:id="@+id/nine" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_9_wht" - android:contentDescription="@string/description_image_button_nine" /> - </TableRow> - - <TableRow - android:layout_height="0px" - android:layout_weight="1"> - <ImageButton android:id="@+id/star" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_star_wht" - android:contentDescription="@string/description_image_button_star" /> - <ImageButton android:id="@+id/zero" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_0_no_plus_wht" - android:contentDescription="@string/description_image_button_zero" /> - <ImageButton android:id="@+id/pound" style="@style/DialpadButtonStyle" - android:src="@drawable/dial_num_pound_wht" - android:contentDescription="@string/description_image_button_pound" /> - </TableRow> - </TableLayout> -</LinearLayout> + android:fitsSystemWindows="true"> + + + <!-- Display of the digits you've typed so far. + This widget appears completely non-interactive to the user: you + can't edit or "hit backspace" since these are DTMF tones you've + 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). --> + <EditText + android:id="@+id/dtmfDialerField" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:layout_marginTop="10dp" + android:layout_marginBottom="5dp" + android:layout_marginStart="32dp" + android:layout_marginEnd="32dp" + android:paddingEnd="16dp" + android:paddingStart="16dp" + 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" + android:focusableInTouchMode="false" + android:clickable="false"/> + + <include layout="@layout/dialpad_incall"/> + </view> +</view> diff --git a/res/layout/incall_screen.xml b/res/layout/incall_screen.xml index f7d9715f..5e6dfb5c 100644 --- a/res/layout/incall_screen.xml +++ b/res/layout/incall_screen.xml @@ -19,43 +19,41 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/incall_button_background" + android:background="@android:color/black" android:id="@+id/main"> - <LinearLayout + <FrameLayout android:id="@+id/in_call_and_button_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> + + <fragment + android:name="com.android.incallui.CallCardFragment" + android:id="@+id/callCardFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <RelativeLayout - android:id="@+id/in_call_card_container" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"> + android:layout_height="match_parent"> - <fragment - android:name="com.android.incallui.CallCardFragment" - android:id="@+id/callCardFragment" + <fragment android:name="com.android.incallui.CallButtonFragment" + android:id="@+id/callButtonFragment" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentTop="true" - android:layout_alignParentStart="true" /> + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" /> + <fragment android:name="com.android.incallui.DialpadFragment" android:id="@+id/dialpadFragment" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentTop="true" - android:layout_alignParentStart="true" /> - </RelativeLayout> + android:layout_height="wrap_content" + android:layout_above="@id/callButtonFragment" + android:layout_alignParentTop="true" /> - <fragment android:name="com.android.incallui.CallButtonFragment" - android:id="@+id/callButtonFragment" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + </RelativeLayout> - </LinearLayout> + </FrameLayout> <fragment android:name="com.android.incallui.AnswerFragment" android:id="@+id/answerFragment" diff --git a/res/layout/incall_screen_msim.xml b/res/layout/incall_screen_msim.xml index 52f79a9f..32ebec8d 100644 --- a/res/layout/incall_screen_msim.xml +++ b/res/layout/incall_screen_msim.xml @@ -18,49 +18,49 @@ limitations under the License. --> -<!-- In-call Phone UI; see InCallActivity.java. --> +<!-- In-call Phone UI; see MsimInCallActivity.java. --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@android:color/black" android:id="@+id/main"> - <LinearLayout + <FrameLayout android:id="@+id/in_call_and_button_container" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> + + <fragment + android:name="com.android.incallui.CallCardFragment" + android:id="@+id/callCardFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> <RelativeLayout - android:id="@+id/in_call_card_container" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"> + android:layout_height="match_parent"> <fragment - android:name="com.android.incallui.CallCardFragment" - android:id="@+id/callCardFragment" + android:name="com.android.incallui.CallButtonFragment" + android:id="@+id/callButtonFragment" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_alignParentTop="true" - android:layout_alignParentStart="true" /> + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" /> + <fragment android:name="com.android.incallui.DialpadFragment" android:id="@+id/dialpadFragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_alignParentTop="true" - android:layout_alignParentStart="true" /> - </RelativeLayout> + android:layout_below="@id/callButtonFragment" + android:layout_alignParentTop="true" /> - <fragment android:name="com.android.incallui.CallButtonFragment" - android:id="@+id/callButtonFragment" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + </RelativeLayout> - </LinearLayout> + </FrameLayout> - <fragment android:name="com.android.incallui.MSimAnswerFragment" + <fragment android:name="com.android.incallui.MsimAnswerFragment" android:id="@+id/answerFragment" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml index 9a030a95..b1ee979e 100644 --- a/res/layout/primary_call_info.xml +++ b/res/layout/primary_call_info.xml @@ -35,7 +35,9 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:orientation="vertical" + android:background="@color/incall_call_banner_background" + android:fitsSystemWindows="true"> <!-- "Call Banner" for primary call, the foregound or ringing call. The "call banner" is a block of info about a single call, @@ -50,8 +52,7 @@ android:paddingStart="@dimen/call_banner_side_padding" android:paddingEnd="@dimen/call_banner_side_padding" android:paddingTop="@dimen/call_banner_top_bottom_padding" - android:paddingBottom="@dimen/call_banner_top_bottom_padding" - android:background="@color/incall_call_banner_background"> + android:paddingBottom="@dimen/call_banner_top_bottom_padding"> <!-- Subscription id: it displays current subscription(SUB1/SUB2/SUB3) information on which currently voice call is active(in foreground). --> |