summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/call_button_fragment.xml21
-rw-r--r--res/layout/caller_in_conference.xml6
-rw-r--r--res/layout/conference_manager_fragment.xml4
-rw-r--r--res/layout/manage_conference_call_button.xml13
-rw-r--r--res/layout/outgoing_call_animation.xml22
-rw-r--r--res/layout/primary_call_info.xml10
-rw-r--r--res/layout/secondary_call_info.xml11
-rw-r--r--res/layout/select_account_list_item.xml38
8 files changed, 56 insertions, 69 deletions
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml
index f1b0a42e..4ddf1d55 100644
--- a/res/layout/call_button_fragment.xml
+++ b/res/layout/call_button_fragment.xml
@@ -35,6 +35,7 @@
android:layout_width="match_parent"
android:layout_margin="0dp"
android:padding="0dp"
+ android:background="@color/button_background_color"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:animateLayoutChanges="true"
@@ -44,10 +45,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/button_cluster_horizontal_padding"
- android:paddingEnd="@dimen/button_cluster_horizontal_padding"
- android:background="@color/button_background_color"
- android:gravity="bottom|center_horizontal">
+ android:gravity="bottom|center_horizontal"
+ android:baselineAligned="false">
<!-- This row only ever shows either 4 or 5 buttons. This may depend on whether the device
supports "Hold" (i.e. 4 buttons on CDMA devices, 5 buttons on GSM devices.) or whether
@@ -66,10 +65,10 @@
<!-- "Audio mode". this is a multi-mode button that can behave either like a simple
"compound button" with two states *or* like an action button that brings up a popup
menu; see btn_compound_audio.xml and CallButtonFragment.updateAudioButtons(). -->
- <ImageButton android:id="@+id/audioButton"
+ <ToggleButton android:id="@+id/audioButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_audio"
- android:contentDescription="@string/onscreenAudioText" />
+ android:contentDescription="@string/audio_mode_speaker" />
<!-- "Change to audio call" for video calls. -->
<ImageButton android:id="@+id/changeToVoiceButton"
@@ -81,7 +80,7 @@
<!-- MIDDLE LEFT SLOT ================================================================== -->
<!-- "Mute" -->
- <ImageButton android:id="@+id/muteButton"
+ <ToggleButton android:id="@+id/muteButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_mute"
android:contentDescription="@string/onscreenMuteText" />
@@ -89,7 +88,7 @@
<!-- CENTER SLOT ======================================================================= -->
<!-- "Dialpad" -->
- <ImageButton android:id="@+id/dialpadButton"
+ <ToggleButton android:id="@+id/dialpadButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_dialpad"
android:contentDescription="@string/onscreenShowDialpadText" />
@@ -100,7 +99,7 @@
other of these must always be set to GONE. -->
<!-- "Hold" -->
- <ImageButton android:id="@+id/holdButton"
+ <ToggleButton android:id="@+id/holdButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_hold"
android:contentDescription="@string/onscreenHoldText" />
@@ -120,7 +119,7 @@
android:visibility="gone" />
<!-- "Switch camera" for video calls. -->
- <ImageButton android:id="@+id/switchCameraButton"
+ <ToggleButton android:id="@+id/switchCameraButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_video_switch"
android:contentDescription="@string/onscreenSwitchCameraText"
@@ -154,7 +153,7 @@
android:visibility="gone" />
<!-- "Switch camera" for video calls. -->
- <ImageButton android:id="@+id/pauseVideoButton"
+ <ToggleButton android:id="@+id/pauseVideoButton"
style="@style/InCallCompoundButton"
android:background="@drawable/btn_compound_video_off"
android:contentDescription="@string/onscreenPauseVideoText"
diff --git a/res/layout/caller_in_conference.xml b/res/layout/caller_in_conference.xml
index 0d15eb10..ac78096f 100644
--- a/res/layout/caller_in_conference.xml
+++ b/res/layout/caller_in_conference.xml
@@ -97,7 +97,8 @@
android:scaleType="center"
android:contentDescription="@string/goPrivate"
android:tint="@color/conference_call_manager_icon_color"
- android:background="?android:attr/selectableItemBackgroundBorderless" />
+ android:background="@drawable/conference_ripple"
+ android:clickable="true" />
<!-- "Disconnect" button which terminates the connection with this caller. -->
<ImageButton
@@ -109,6 +110,7 @@
android:scaleType="center"
android:contentDescription="@string/onscreenEndCallText"
android:tint="@color/conference_call_manager_icon_color"
- android:background="?android:attr/selectableItemBackgroundBorderless" />
+ android:background="@drawable/conference_ripple"
+ android:clickable="true" />
</LinearLayout> <!-- End of single list element -->
diff --git a/res/layout/conference_manager_fragment.xml b/res/layout/conference_manager_fragment.xml
index 5aed520b..a363693c 100644
--- a/res/layout/conference_manager_fragment.xml
+++ b/res/layout/conference_manager_fragment.xml
@@ -33,5 +33,7 @@
android:layout_height="match_parent"
android:listSelector="@null"
android:background="@color/background_dialer_white"
- android:divider="@null" />
+ android:divider="@null"
+ android:focusableInTouchMode="true"
+ android:focusable="true"/>
</FrameLayout>
diff --git a/res/layout/manage_conference_call_button.xml b/res/layout/manage_conference_call_button.xml
index e9de926f..3b5ef993 100644
--- a/res/layout/manage_conference_call_button.xml
+++ b/res/layout/manage_conference_call_button.xml
@@ -15,12 +15,14 @@
~ limitations under the License
-->
-<!-- This button is used only on GSM devices, during a conference call. -->
+<!-- This button is used only on GSM and IMS devices, during a conference call. -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/manage_conference_call_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/incall_banner_secondary_background_color">
+ android:background="@color/incall_banner_secondary_background_color"
+ android:focusable="true"
+ android:contentDescription="@string/onscreenManageConferenceText">
<Space android:layout_width="match_parent"
android:layout_height="1dp"
@@ -42,8 +44,8 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_group_white_24dp"
android:tint="@color/incall_banner_secondary_text_color"
- android:contentDescription="@string/onscreenManageConferenceText"
- android:paddingEnd="16dp" />
+ android:paddingEnd="16dp"
+ android:importantForAccessibility="no" />
<TextView android:id="@+id/manageConferenceButtonLabel"
android:layout_width="match_parent"
@@ -51,7 +53,8 @@
android:gravity="center_vertical"
android:textColor="@color/incall_banner_secondary_text_color"
android:textSize="@dimen/secondary_call_info_text_size"
- android:text="@string/onscreenManageConferenceText" />
+ android:text="@string/onscreenManageConferenceText"
+ android:importantForAccessibility="no" />
</LinearLayout>
diff --git a/res/layout/outgoing_call_animation.xml b/res/layout/outgoing_call_animation.xml
new file mode 100644
index 00000000..69ba3d3c
--- /dev/null
+++ b/res/layout/outgoing_call_animation.xml
@@ -0,0 +1,22 @@
+<?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
+ -->
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/outgoing_call_animation_circle"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/incall_background_color" /> \ No newline at end of file
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
index 1f3b9549..71369d47 100644
--- a/res/layout/primary_call_info.xml
+++ b/res/layout/primary_call_info.xml
@@ -64,6 +64,7 @@
<TextView android:id="@+id/callStateLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/incall_accent_color"
android:textSize="@dimen/call_status_text_size"
@@ -71,6 +72,7 @@
android:singleLine="true"
android:gravity="start"
android:ellipsize="end" />
+
</LinearLayout>
<!-- Name (or the phone number, if we don't have a name to display). -->
@@ -80,6 +82,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="-5dp"
android:fontFamily="sans-serif-light"
+ android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="@dimen/call_name_text_size"
android:singleLine="true"
@@ -95,9 +98,8 @@
<!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
<LinearLayout android:id="@+id/labelAndNumber"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
android:orientation="horizontal">
<TextView android:id="@+id/label"
@@ -122,9 +124,11 @@
<!-- Elapsed time indication for a call in progress. -->
<TextView android:id="@+id/elapsedTime"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:layout_weight="1"
android:layout_centerVertical="true"
+ android:textAlignment="viewEnd"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/incall_call_banner_subtext_color"
android:textSize="@dimen/call_label_text_size"
diff --git a/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml
index 8666c2ae..85eef0ee 100644
--- a/res/layout/secondary_call_info.xml
+++ b/res/layout/secondary_call_info.xml
@@ -59,6 +59,7 @@
android:layout_height="wrap_content"
android:textColor="@color/incall_banner_secondary_text_color"
android:textSize="@dimen/secondary_call_info_text_size"
+ android:textAlignment="viewStart"
android:ellipsize="marquee"
android:singleLine="true"/>
@@ -69,19 +70,12 @@
android:orientation="horizontal"
android:visibility="gone" >
- <ImageView android:id="@+id/secondaryCallProviderIcon"
- android:layout_width="@dimen/call_provider_small_icon_size"
- android:layout_height="@dimen/call_provider_small_icon_size"
- android:layout_marginRight="2dp"
- android:baselineAlignBottom="true"
- android:scaleType="centerInside"
- android:tint="@color/incall_banner_secondary_text_color" />
-
<TextView android:id="@+id/secondaryCallProviderLabel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/incall_banner_secondary_text_color"
android:textSize="@dimen/secondary_call_info_text_size"
+ android:textAlignment="viewStart"
android:singleLine="true"/>
</LinearLayout>
@@ -97,7 +91,6 @@
android:text="@string/onHold"
android:textColor="@color/incall_banner_secondary_text_color"
android:textSize="@dimen/secondary_call_info_text_size"
- android:textAlignment="textEnd"
android:singleLine="true" />
</LinearLayout>
diff --git a/res/layout/select_account_list_item.xml b/res/layout/select_account_list_item.xml
deleted file mode 100644
index 1999fced..00000000
--- a/res/layout/select_account_list_item.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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.
--->
-
-<!-- Layout of a single item in the InCallUI Account Chooser Dialog. -->
-<view class="com.android.contacts.common.widget.ActivityTouchLinearLayout"
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="4dp" >
-
- <ImageView android:id="@+id/icon"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:tint="@color/dialtacts_secondary_text_color"
- android:scaleType="center" />
-
- <TextView android:id="@+id/text"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:gravity="start|center_vertical"
- android:layout_marginLeft="8dp"
- android:layout_width="0dp"
- android:layout_weight="1"
- android:layout_height="match_parent" />
-</view>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 22:13:43 +0000