commit 476bd2689302500835ce734812a67852c374927d
author Tyler Gunn <tgunn@google.com> Mon Aug 10 10:03:37 2015 -0700
committer Tyler Gunn <tgunn@google.com> Mon Aug 10 10:03:37 2015 -0700
tree 5c6b1e39b842ee8eda995d3b6d6effbc83d31f12
parent c72f419b18258cfc6f29590e3b97dac8b175f904

Consolidate CallSubject history and dialog.

- Removed CallSubjectHistory activity and put that functionality into
CallSubjectDialog.
- 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: Ie5200e8d925f0a58558f1adff1e7234edc1db1b9

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ae1e3d6..4936768 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -172,8 +172,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.contacts.common.dialog.CallSubjectHistory"
-                  android:theme="@style/Theme.CallSubjectSelector">
+        <activity android:name="com.android.contacts.common.dialog.CallSubjectDialog"
+                  android:theme="@style/Theme.CallSubjectDialogTheme"
+                  android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
             </intent-filter>