am 4325af9b: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev
* commit '4325af9b87d8d48cb9443e8ad5bf0a3658622887':
Consolidate CallSubject history and dialog.
diff --git a/res-common/drawable/dialog_background_material.xml b/res-common/drawable/dialog_background_material.xml
new file mode 100644
index 0000000..fb586a0
--- /dev/null
+++ b/res-common/drawable/dialog_background_material.xml
@@ -0,0 +1,23 @@
+<?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.
+-->
+
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+ android:inset="16dp">
+ <shape android:shape="rectangle">
+ <corners android:radius="2dp" />
+ <solid android:color="@color/call_subject_history_background" />
+ </shape>
+</inset>
diff --git a/res-common/layout/call_subject_history_list_item.xml b/res-common/layout/call_subject_history_list_item.xml
new file mode 100644
index 0000000..b8cce47
--- /dev/null
+++ b/res-common/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-common/layout/dialog_call_subject.xml b/res-common/layout/dialog_call_subject.xml
index 005f440..d6365c2 100644
--- a/res-common/layout/dialog_call_subject.xml
+++ b/res-common/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" >
-
- <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" />
-
- <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: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"/>
+ android:layout_height="match_parent"
+ android:background="@android:color/transparent"
+ android:id="@+id/call_subject_dialog"
+ android:orientation="vertical">
<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">
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:layout_width="match_parent">
- <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"
+ <!-- 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: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" />
+ android:clickable="true"
+ android:theme="@android:style/Theme.Material.Light.Dialog"
+ android:elevation="16dp"
+ android:layout_centerInParent="true"
+ android:background="@drawable/dialog_background_material">
+ <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" />
+
+ <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: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"/>
+
+ <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
diff --git a/res-common/values/dimens.xml b/res-common/values/dimens.xml
index fd38024..8d612ff 100644
--- a/res-common/values/dimens.xml
+++ b/res-common/values/dimens.xml
@@ -159,4 +159,6 @@
<dimen name="call_subject_dialog_primary_text_size">16sp</dimen>
<!-- Size of secondary text in the call subject dialog. -->
<dimen name="call_subject_dialog_secondary_text_size">14sp</dimen>
+ <!-- Row padding for call subject history items. -->
+ <dimen name="call_subject_history_item_padding">15dp</dimen>
</resources>
diff --git a/res-common/values/integers.xml b/res-common/values/integers.xml
index fc1209f..f3d1e74 100644
--- a/res-common/values/integers.xml
+++ b/res-common/values/integers.xml
@@ -30,4 +30,7 @@
<!-- Layout weight of card in contact list view.
Default to 0 to indicate no padding -->
<integer name="contact_list_card_layout_weight">0</integer>
+
+ <!-- Duration of the animations on the call subject dialog. -->
+ <integer name="call_subject_animation_duration">250</integer>
</resources>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 6ab07d3..77c4677 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -89,25 +89,18 @@
<item name="android:windowIsFloating">true</item>
</style>
- <style name="CallSubjectDialogTheme" parent="android:Theme.Material.Light.Dialog">
- <item name="android:layout_width">fill_parent</item>
- <item name="android:layout_height">fill_parent</item>
+ <style name="Theme.CallSubjectDialogTheme" parent="@android:style/Theme.Material.Light.Dialog">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">match_parent</item>
<!-- No backgrounds, titles or window float -->
- <item name="android:windowNoTitle">true</item>
- <item name="android:windowFullscreen">true</item>
- <item name="android:windowIsFloating">true</item>
- </style>
-
- <!-- Theme used for the call subjection history selection activity. -->
- <style name="Theme.CallSubjectSelector" parent="android:Theme.Material.Light">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowNoTitle">true</item>
+ <item name="android:windowFullscreen">false</item>
+ <item name="android:windowIsFloating">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
- <item name="android:backgroundDimEnabled">false</item>
- <item name="android:windowTranslucentStatus">false</item>
- <item name="android:windowTranslucentNavigation">false</item>
<item name="android:windowDrawsSystemBarBackgrounds">false</item>
<item name="android:windowContentOverlay">@null</item>
+ <item name="android:windowElevation">0dp</item>
</style>
</resources>