am 9e9768d1: am c35d3966: Add CallHistory activity to CallSubjectDialog, plus others.
* commit '9e9768d17a8980f7f688ba7c6861e8a74d46eb50':
Add CallHistory activity to CallSubjectDialog, plus others.
diff --git a/res-common/layout/call_subject_history.xml b/res-common/layout/call_subject_history.xml
new file mode 100644
index 0000000..5f6ef3a
--- /dev/null
+++ b/res-common/layout/call_subject_history.xml
@@ -0,0 +1,33 @@
+<?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
+ -->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/background"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@android:color/transparent" >
+
+ <ListView
+ android:id="@+id/subject_list"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_alignParentBottom="true"
+ android:background="@color/call_subject_history_background"
+ android:divider="@null"
+ android:elevation="8dp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res-common/layout/dialog_call_subject.xml b/res-common/layout/dialog_call_subject.xml
index 3b7addd..005f440 100644
--- a/res-common/layout/dialog_call_subject.xml
+++ b/res-common/layout/dialog_call_subject.xml
@@ -19,7 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="wrap_content" >
<LinearLayout
android:layout_width="match_parent"
diff --git a/res-common/values/colors.xml b/res-common/values/colors.xml
index 7c21268..0dc85b5 100644
--- a/res-common/values/colors.xml
+++ b/res-common/values/colors.xml
@@ -163,4 +163,7 @@
<!-- Text color for the SEND & CALL button on the call subject dialog. -->
<color name="call_subject_button">#00c853</color>
+
+ <!-- Background color for the call subject history view. -->
+ <color name="call_subject_history_background">#ffffff</color>
</resources>
diff --git a/res-common/values/styles.xml b/res-common/values/styles.xml
index 94916b8..6ab07d3 100644
--- a/res-common/values/styles.xml
+++ b/res-common/values/styles.xml
@@ -98,4 +98,16 @@
<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: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>
+ </style>
</resources>