From 71d1a967eb611ab5a9708ad9de3c425d56353ed4 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Mon, 10 Aug 2015 10:02:59 -0700
Subject: 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: I34a127b430c129c3f6333536b9da9808effa35a6
---
 AndroidManifest.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ed0acddc..68adf0f6a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -490,8 +490,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>
-- 
cgit v1.2.3