diff options
author | Tyler Gunn <tgunn@google.com> | 2015-08-12 14:34:45 -0700 |
---|---|---|
committer | Tyler Gunn <tgunn@google.com> | 2015-08-12 14:34:45 -0700 |
commit | 6510868e03604f36699e92f1a2f5f06e1ccdf726 (patch) | |
tree | 5cea95ad178d120a0f02f700c44ed72a64ebffd1 /res/layout | |
parent | 6fb8c107970104b02688c3f536e6bef51cf24f88 (diff) | |
download | android_packages_apps_ContactsCommon-6510868e03604f36699e92f1a2f5f06e1ccdf726.tar.gz android_packages_apps_ContactsCommon-6510868e03604f36699e92f1a2f5f06e1ccdf726.tar.bz2 android_packages_apps_ContactsCommon-6510868e03604f36699e92f1a2f5f06e1ccdf726.zip |
Consolidate CallSubject history and dialog.
- Removed CallSubjectHistory activity and put that functionality into
CallSubjectDialog.
- Changed CallSubjectDialog into an activity styled after a dialog.
- Although dialog_call_subject looks a lot different, the main change is
the addition of the subject_list above the dialog in the layout (I tried
having it below the dialog but I could not get the layout to work
properly). A RelativeLayout was used so that when the subject history
list is shown, the dialog naturally moves up to fit the call history list.
- Added layout for the call subject history list items to give better
control of their appearance.
- This was to give better control of layout and make it possible to
animate between show/hide of call subject history.
Bug: 22685114
Change-Id: I7555bb09b86c50b52a76661f1460f4fe0e30bd97
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/call_subject_history_list_item.xml | 29 | ||||
-rw-r--r-- | res/layout/dialog_call_subject.xml | 210 |
2 files changed, 149 insertions, 90 deletions
diff --git a/res/layout/call_subject_history_list_item.xml b/res/layout/call_subject_history_list_item.xml new file mode 100644 index 00000000..b8cce475 --- /dev/null +++ b/res/layout/call_subject_history_list_item.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> + +<TextView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@android:id/text1" + android:gravity="center_vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="@dimen/call_subject_dialog_margin" + android:paddingEnd="@dimen/call_subject_dialog_margin" + android:paddingTop="@dimen/call_subject_history_item_padding" + android:paddingBottom="@dimen/call_subject_history_item_padding" + android:singleLine="true" + android:textColor="@color/dialtacts_primary_text_color" + android:textSize="@dimen/call_subject_dialog_primary_text_size" /> diff --git a/res/layout/dialog_call_subject.xml b/res/layout/dialog_call_subject.xml index 005f4402..d6365c24 100644 --- a/res/layout/dialog_call_subject.xml +++ b/res/layout/dialog_call_subject.xml @@ -17,113 +17,143 @@ <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_height="match_parent" + android:background="@android:color/transparent" + android:id="@+id/call_subject_dialog" + android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginStart="@dimen/call_subject_dialog_margin" - android:layout_marginEnd="@dimen/call_subject_dialog_margin" - android:layout_marginTop="@dimen/call_subject_dialog_margin"> - - <QuickContactBadge - android:id="@+id/contact_photo" - android:layout_width="@dimen/call_subject_dialog_contact_photo_size" - android:layout_height="@dimen/call_subject_dialog_contact_photo_size" - android:layout_gravity="top" - android:focusable="true" - android:layout_marginEnd="@dimen/call_subject_dialog_margin" /> + <RelativeLayout + android:layout_height="0dp" + android:layout_weight="1" + android:layout_width="match_parent"> + <!-- The call subject dialog will be centered in the space above the subject list. --> <LinearLayout + android:id="@+id/dialog_view" + android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_vertical"> + android:clickable="true" + android:theme="@android:style/Theme.Material.Light.Dialog" + android:elevation="16dp" + android:layout_centerInParent="true" + android:background="@drawable/dialog_background_material"> - <TextView - android:id="@+id/name" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/dialtacts_primary_text_color" + android:orientation="horizontal" + android:layout_marginStart="@dimen/call_subject_dialog_margin" + android:layout_marginEnd="@dimen/call_subject_dialog_margin" + android:layout_marginTop="@dimen/call_subject_dialog_margin"> + + <QuickContactBadge + android:id="@+id/contact_photo" + android:layout_width="@dimen/call_subject_dialog_contact_photo_size" + android:layout_height="@dimen/call_subject_dialog_contact_photo_size" + android:layout_gravity="top" + android:focusable="true" + android:layout_marginEnd="@dimen/call_subject_dialog_margin" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_vertical"> + + <TextView + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/dialtacts_primary_text_color" + android:textSize="@dimen/call_subject_dialog_secondary_text_size" + android:singleLine="true" /> + + <TextView + android:id="@+id/number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginTop="@dimen/call_subject_dialog_between_line_margin" + android:textColor="@color/dialtacts_secondary_text_color" + android:textSize="@dimen/call_subject_dialog_secondary_text_size" + android:singleLine="true" /> + </LinearLayout> + </LinearLayout> + + <EditText + android:id="@+id/call_subject" + android:hint="@string/call_subject_hint" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:layout_gravity="top" + android:textColor="@color/dialtacts_secondary_text_color" android:textSize="@dimen/call_subject_dialog_secondary_text_size" - android:singleLine="true" /> + android:gravity="top" + android:background="@null" + android:layout_marginTop="@dimen/call_subject_dialog_edit_spacing" + android:layout_marginStart="@dimen/call_subject_dialog_margin" + android:layout_marginEnd="@dimen/call_subject_dialog_margin" + /> <TextView - android:id="@+id/number" + android:id="@+id/character_limit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginTop="@dimen/call_subject_dialog_between_line_margin" android:textColor="@color/dialtacts_secondary_text_color" android:textSize="@dimen/call_subject_dialog_secondary_text_size" - android:singleLine="true" /> - </LinearLayout> - </LinearLayout> + android:singleLine="true" + android:layout_marginStart="@dimen/call_subject_dialog_margin" + android:layout_marginEnd="@dimen/call_subject_dialog_margin" + android:layout_marginTop="@dimen/call_subject_dialog_margin" + android:layout_marginBottom="@dimen/call_subject_dialog_margin"/> - <EditText - android:id="@+id/call_subject" - android:hint="@string/call_subject_hint" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:layout_gravity="top" - android:textColor="@color/dialtacts_secondary_text_color" - android:textSize="@dimen/call_subject_dialog_secondary_text_size" - android:gravity="top" - android:background="@null" - android:layout_marginTop="@dimen/call_subject_dialog_edit_spacing" - android:layout_marginStart="@dimen/call_subject_dialog_margin" - android:layout_marginEnd="@dimen/call_subject_dialog_margin" - /> - - <TextView - android:id="@+id/character_limit" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/dialtacts_secondary_text_color" - android:textSize="@dimen/call_subject_dialog_secondary_text_size" - android:singleLine="true" - android:layout_marginStart="@dimen/call_subject_dialog_margin" - android:layout_marginEnd="@dimen/call_subject_dialog_margin" - android:layout_marginTop="@dimen/call_subject_dialog_margin" - android:layout_marginBottom="@dimen/call_subject_dialog_margin"/> - - <View - android:layout_width="fill_parent" - android:layout_height="1dp" - android:background="@color/call_subject_divider"/> + <View + android:layout_width="fill_parent" + android:layout_height="1dp" + android:background="@color/call_subject_divider"/> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:layout_marginStart="@dimen/call_subject_dialog_margin" - android:layout_marginEnd="@dimen/call_subject_dialog_margin" - android:layout_marginTop="@dimen/call_subject_dialog_margin" - android:layout_marginBottom="@dimen/call_subject_dialog_margin"> - - <ImageView - android:id="@+id/history_button" - android:layout_width="25dp" - android:layout_height="25dp" - android:src="@drawable/ic_history_white_drawable_24dp" - android:tint="@color/call_subject_history_icon" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" /> - - <TextView - android:id="@+id/send_and_call_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/send_and_call_button" - android:textColor="@color/call_subject_button" - android:textSize="@dimen/call_subject_dialog_secondary_text_size" - android:singleLine="true" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" /> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/call_subject_dialog_margin" + android:layout_marginEnd="@dimen/call_subject_dialog_margin" + android:layout_marginTop="@dimen/call_subject_dialog_margin" + android:layout_marginBottom="@dimen/call_subject_dialog_margin"> + + <ImageView + android:id="@+id/history_button" + android:layout_width="25dp" + android:layout_height="25dp" + android:src="@drawable/ic_history_white_drawable_24dp" + android:tint="@color/call_subject_history_icon" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" /> + <TextView + android:id="@+id/send_and_call_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/send_and_call_button" + android:textColor="@color/call_subject_button" + android:textSize="@dimen/call_subject_dialog_secondary_text_size" + android:singleLine="true" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" /> + + </RelativeLayout> + </LinearLayout> </RelativeLayout> + <!-- The subject list is pinned to the bottom of the screen. --> + <ListView + android:id="@+id/subject_list" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:layout_below="@id/dialog_view" + android:background="@color/call_subject_history_background" + android:divider="@null" + android:elevation="8dp" /> + </LinearLayout>
\ No newline at end of file |