diff options
Diffstat (limited to 'java/com/android/dialer/contactsfragment/res')
5 files changed, 4 insertions, 111 deletions
diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml deleted file mode 100644 index a7b227799..000000000 --- a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_container_background.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2017 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 - --> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <solid android:color="@color/dialer_theme_color"/> - <size - android:height="@dimen/fast_scroller_container_size" - android:width="@dimen/fast_scroller_container_size"/> - <corners - android:topLeftRadius="@dimen/fast_scroller_container_corner_radius" - android:topRightRadius="@dimen/fast_scroller_container_corner_radius" - android:bottomLeftRadius="@dimen/fast_scroller_bottom_left_corner_radius" - android:bottomRightRadius="@dimen/fast_scroller_bottom_right_corner_radius"/> -</shape>
\ No newline at end of file diff --git a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml b/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml deleted file mode 100644 index a3e0c25c7..000000000 --- a/java/com/android/dialer/contactsfragment/res/drawable/fast_scroller_scroll_bar.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2017 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 - --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_selected="true"> - <shape android:shape="rectangle"> - <solid android:color="@color/dialer_theme_color"/> - <size android:height="32dp" android:width="4dp"/> - <corners android:radius="2dp"/> - </shape> - </item> - <item> - <shape android:shape="rectangle"> - <solid android:color="@color/dialer_secondary_text_color"/> - <size android:height="32dp" android:width="4dp"/> - <corners android:radius="2dp"/> - </shape> - </item> -</selector>
\ No newline at end of file diff --git a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml index 9e829fee4..af87c7f18 100644 --- a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml +++ b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml @@ -43,13 +43,11 @@ <TextView android:id="@+id/contact_name" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent" android:paddingStart="@dimen/text_padding_start" android:paddingEnd="@dimen/text_padding_end" - android:maxLines="1" - android:ellipsize="end" - android:gravity="center_vertical" + android:gravity="center_vertical|start" android:textSize="@dimen/text_size" android:textColor="@color/dialer_primary_text_color" android:fontFamily="sans-serif"/> diff --git a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml index 7cbc4f0e6..67b490f03 100644 --- a/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml +++ b/java/com/android/dialer/contactsfragment/res/layout/fragment_contacts.xml @@ -23,46 +23,8 @@ android:id="@+id/recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_dialer_light"/> - - <!-- Scrollbars are always on the right side of the screen. Layouts should use Rights/Left instead - of Start/End --> - <com.android.dialer.contactsfragment.FastScroller - android:id="@+id/fast_scroller" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - android:clipChildren="false"> - - <TextView - android:id="@+id/fast_scroller_container" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@+id/fast_scroller_scroll_bar" - android:gravity="center" - android:textSize="48sp" - android:textColor="@color/background_dialer_white" - android:visibility="gone" - android:background="@drawable/fast_scroller_container_background"/> - - <ImageView - android:id="@+id/fast_scroller_scroll_bar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_alignParentRight="true" - android:paddingRight="16dp" - android:src="@drawable/fast_scroller_scroll_bar" /> - </com.android.dialer.contactsfragment.FastScroller> + android:background="@color/background_dialer_white"/> <!-- Anchored header view --> <include layout="@layout/header"/> - - <com.android.dialer.widget.EmptyContentView - android:id="@+id/empty_list_view" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:visibility="gone"/> </FrameLayout> diff --git a/java/com/android/dialer/contactsfragment/res/values/dimens.xml b/java/com/android/dialer/contactsfragment/res/values/dimens.xml index f120014e2..00d7c6d7e 100644 --- a/java/com/android/dialer/contactsfragment/res/values/dimens.xml +++ b/java/com/android/dialer/contactsfragment/res/values/dimens.xml @@ -25,11 +25,4 @@ <dimen name="text_padding_start">16dp</dimen> <dimen name="text_padding_end">8dp</dimen> <dimen name="text_size">16sp</dimen> - - <dimen name="fast_scroller_touch_target_width">20dp</dimen> - - <dimen name="fast_scroller_container_size">88dp</dimen> - <dimen name="fast_scroller_container_corner_radius">44dp</dimen> - <dimen name="fast_scroller_bottom_right_corner_radius">0px</dimen> - <dimen name="fast_scroller_bottom_left_corner_radius">44dp</dimen> -</resources>
\ No newline at end of file +</resources> |