summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/call_log_list_item.xml24
-rw-r--r--res/layout/call_log_list_item_actions.xml145
2 files changed, 61 insertions, 108 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 9ea3db8d0..7a826d9f5 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -44,15 +44,13 @@
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:baselineAligned="false"
- android:orientation="vertical"
- android:gravity="center_vertical"
card_view:cardCornerRadius="4dp"
card_view:cardBackgroundColor="@color/background_dialer_call_log_list_item">
<!-- Primary area containing the contact badge and caller information -->
<LinearLayout
android:id="@+id/primary_action_view"
- android:background="@drawable/call_log_background"
+ android:background="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/call_log_start_margin"
@@ -142,26 +140,28 @@
</LinearLayout>
<ImageView
- android:id="@+id/call_indicator_icon"
+ android:id="@+id/call_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/call_log_icon_margin"
+ android:background="?android:attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_card_phone"
android:tint="@color/recent_call_log_item_phone_icon_tint"
android:alpha="0.3"
- android:importantForAccessibility="no"
+ android:contentDescription="@string/description_call_log_call_action"
android:visibility="gone" />
- <!-- Viewstub with additional expandable actions for a call log entry -->
- <ViewStub android:id="@+id/call_log_entry_actions_stub"
- android:inflatedId="@+id/call_log_entry_actions"
- android:layout="@layout/call_log_list_item_actions"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"/>
-
</LinearLayout>
+ <!-- Viewstub with additional expandable actions for a call log entry -->
+ <ViewStub android:id="@+id/call_log_entry_actions_stub"
+ android:inflatedId="@+id/call_log_entry_actions"
+ android:layout="@layout/call_log_list_item_actions"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="bottom" />
+
</android.support.v7.widget.CardView>
</LinearLayout>
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index 1280089f5..8ef92bf1a 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -14,100 +14,53 @@
~ See the License for the specific language governing permissions and
~ limitations under the License
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:id="@+id/call_log_action_container">
- <LinearLayout
- android:id="@+id/call_log_entry_actions_ll"
- android:gravity="center_vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/call_log_action_container"
+ android:gravity="center_vertical"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="visible"
+ android:importantForAccessibility="1">
+
+ <!-- Temporary border spacer. -->
+ <View
android:layout_width="match_parent"
- android:layout_height="@dimen/call_log_action_height"
- android:orientation="horizontal"
- android:paddingStart="@dimen/call_log_actions_left_padding"
- android:visibility="visible"
- android:importantForAccessibility="1"
- >
- <TextView
- android:id="@+id/call_back_action"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/call_log_action_horizontal_padding"
- android:paddingEnd="@dimen/call_log_action_horizontal_padding"
- android:text="@string/call_log_action_call_back"
- android:textColor="@color/call_log_action_text"
- android:textSize="@dimen/call_log_list_item_actions_text_size"
- android:textStyle="bold"
- android:nextFocusLeft="@+id/primary_action_view"
- android:nextFocusRight="@+id/video_call_action"
- android:focusable="true"
- android:singleLine="true"/>
- <TextView
- android:id="@+id/video_call_action"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/call_log_action_horizontal_padding"
- android:paddingEnd="@dimen/call_log_action_horizontal_padding"
- android:text="@string/call_log_action_video_call"
- android:textColor="?attr/call_log_secondary_text_color"
- android:textSize="@dimen/call_log_list_item_actions_text_size"
- android:textStyle="bold"
- android:nextFocusLeft="@+id/call_back_action"
- android:nextFocusRight="@+id/voicemail_action"
- android:focusable="true"
- android:singleLine="true"/>
- <TextView
- android:id="@+id/voicemail_action"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/call_log_action_horizontal_padding"
- android:paddingEnd="@dimen/call_log_action_horizontal_padding"
- android:text="@string/call_log_action_voicemail"
- android:textColor="@color/call_log_action_text"
- android:textSize="@dimen/call_log_list_item_actions_text_size"
- android:textStyle="bold"
- android:nextFocusLeft="@+id/video_call_action"
- android:nextFocusRight="@+id/details_action"
- android:focusable="true"
- android:singleLine="true"/>
- <TextView
- android:id="@+id/details_action"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/call_log_action_horizontal_padding"
- android:paddingEnd="@dimen/call_log_action_horizontal_padding"
- android:text="@string/call_log_action_details"
- android:textColor="?attr/call_log_secondary_text_color"
- android:textSize="@dimen/call_log_list_item_actions_text_size"
- android:textStyle="bold"
- android:nextFocusLeft="@+id/voicemail_action"
- android:nextFocusRight="@+id/report_action"
- android:focusable="true"
- android:singleLine="true"/>
- <TextView
- android:id="@+id/report_action"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:paddingStart="@dimen/call_log_action_horizontal_padding"
- android:paddingEnd="@dimen/call_log_action_horizontal_padding"
- android:text="@string/call_log_action_report"
- android:textColor="?attr/call_log_secondary_text_color"
- android:textSize="@dimen/call_log_list_item_actions_text_size"
- android:textStyle="bold"
- android:nextFocusLeft="@+id/details_action"
- android:nextFocusRight="@+id/primary_action_view"
- android:focusable="true"
- android:singleLine="true"
- android:visibility="gone"/>
- </LinearLayout>
-</FrameLayout>
+ android:layout_height="1dp"
+ android:layout_weight="1"
+ android:background="#eeeeee" />
+
+ <TextView
+ android:id="@+id/video_call_action"
+ style="@style/CallLogActionsStyle"
+ android:background="?android:attr/selectableItemBackground"
+ android:text="@string/call_log_action_video_call"
+ android:nextFocusLeft="@+id/primary_action_view"
+ android:nextFocusRight="@+id/voicemail_action" />
+
+ <TextView
+ android:id="@+id/voicemail_action"
+ style="@style/CallLogActionsStyle"
+ android:background="?android:attr/selectableItemBackground"
+ android:text="@string/call_log_action_voicemail"
+ android:nextFocusLeft="@+id/video_call_action"
+ android:nextFocusRight="@+id/details_action" />
+
+ <TextView
+ android:id="@+id/details_action"
+ style="@style/CallLogActionsStyle"
+ android:background="?android:attr/selectableItemBackground"
+ android:text="@string/call_log_action_details"
+ android:nextFocusLeft="@+id/voicemail_action"
+ android:nextFocusRight="@+id/report_action" />
+
+ <TextView
+ android:id="@+id/report_action"
+ style="@style/CallLogActionsStyle"
+ android:background="?android:attr/selectableItemBackground"
+ android:text="@string/call_log_action_report"
+ android:nextFocusLeft="@+id/details_action"
+ android:nextFocusRight="@+id/primary_action_view"
+ android:visibility="gone" />
+
+</LinearLayout>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-17 18:04:46 +0000