diff options
author | calderwoodra <calderwoodra@google.com> | 2017-11-30 15:21:47 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-11-30 17:17:09 -0800 |
commit | 9873647e903574ee4ef62b2f13633650793c346e (patch) | |
tree | 8446501d66585a2910fdb1677a8e4e02ee400662 /java/com/android/dialer/speeddial/res | |
parent | 71eae26ab4f9a8eaab16271edf63476762e28f75 (diff) |
Implemented new favorites list UI.
Bug: 36841782
Test: implemented
PiperOrigin-RevId: 177516412
Change-Id: If9478ce22c10fd17e352d5fdcc2c0bef5e14a6d8
Diffstat (limited to 'java/com/android/dialer/speeddial/res')
6 files changed, 211 insertions, 4 deletions
diff --git a/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml new file mode 100644 index 000000000..81b018ff1 --- /dev/null +++ b/java/com/android/dialer/speeddial/res/drawable/favorite_icon.xml @@ -0,0 +1,23 @@ +<?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="oval"> + + <solid android:color="@color/dialer_theme_color"/> + <stroke android:color="@color/background_dialer_light" android:width="3dp"/> +</shape>
\ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml new file mode 100644 index 000000000..fb476659c --- /dev/null +++ b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml @@ -0,0 +1,70 @@ +<?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 + --> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:layout_marginBottom="12dp"> + + <FrameLayout + android:id="@+id/avatar_container" + android:layout_width="104dp" + android:layout_height="104dp" + android:layout_gravity="center_horizontal" + android:layout_marginBottom="8dp"> + + <com.android.dialer.speeddial.SquareImageView + android:id="@+id/avatar" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clickable="false"/> + + <FrameLayout + android:id="@+id/video_call_container" + android:layout_width="36dp" + android:layout_height="36dp" + android:layout_gravity="bottom|end"> + + <ImageView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:src="@drawable/favorite_icon"/> + + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_gravity="center" + android:src="@drawable/quantum_ic_videocam_white_24"/> + </FrameLayout> + </FrameLayout> + + <TextView + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + style="@style/PrimaryText"/> + + <TextView + android:id="@+id/phone_type" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + style="@style/SecondaryText"/> +</LinearLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml index 04e230e4d..d432f097b 100644 --- a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml +++ b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml @@ -14,7 +14,11 @@ ~ 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_height="match_parent" - android:layout_width="match_parent"/> +<android.support.v7.widget.RecyclerView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/speed_dial_recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:clipToPadding="false"/> diff --git a/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml new file mode 100644 index 000000000..0a84b41e6 --- /dev/null +++ b/java/com/android/dialer/speeddial/res/layout/speed_dial_header_layout.xml @@ -0,0 +1,41 @@ +<?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 + --> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="@dimen/dialer_list_item_min_height"> + + <TextView + android:id="@+id/speed_dial_header_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:textSize="16sp" + style="@style/SecondaryText"/> + + <Button + android:id="@+id/speed_dial_add_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:minHeight="@dimen/dialer_touch_target_min_size" + android:minWidth="@dimen/dialer_button_min_width" + android:text="@string/speed_dial_add_button_text" + android:textColor="@color/dialer_theme_color" + style="@style/Widget.AppCompat.Button.Borderless"/> +</RelativeLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml new file mode 100644 index 000000000..4281700f3 --- /dev/null +++ b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml @@ -0,0 +1,61 @@ +<?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 + --> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="72dp"> + + <QuickContactBadge + android:id="@+id/avatar" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_centerVertical="true"/> + + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="56dp" + android:layout_centerVertical="true" + android:layout_alignParentStart="true" + android:layout_toStartOf="@+id/overflow"> + + <TextView + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/PrimaryText"/> + + <TextView + android:id="@+id/number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + style="@style/SecondaryText"/> + </LinearLayout> + + <ImageView + android:id="@+id/overflow" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_centerVertical="true" + android:layout_alignParentEnd="true" + android:scaleType="center" + android:tint="@color/secondary_text_color" + android:src="@drawable/quantum_ic_more_vert_white_24" + android:background="?android:selectableItemBackgroundBorderless"/> +</RelativeLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/values/strings.xml b/java/com/android/dialer/speeddial/res/values/strings.xml index 5929df8dd..f814ed6d4 100644 --- a/java/com/android/dialer/speeddial/res/values/strings.xml +++ b/java/com/android/dialer/speeddial/res/values/strings.xml @@ -15,4 +15,12 @@ ~ limitations under the License --> <resources> + <!-- header for a list of contacts that are the users favorites. --> + <string name="favorites_header">Favorites</string> + + <!-- header for a list of contacts that are suggestions for the user to place calls to --> + <string name="suggestions_header">Suggestions</string> + + <!-- text for a button that prompts the user to add a contact to their favorites --> + <string name="speed_dial_add_button_text">Add</string> </resources>
\ No newline at end of file |