commit ed6a6e0dfae1adc99087361c0b6d6d27eff4eea1
author Tyler Gunn <tgunn@google.com> Thu Aug 13 15:41:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 13 15:41:38 2015 +0000
tree 5e86d03cfa23315a8c436c6cb4e5645cde00fa91
parent 86700ec6a8d8871bf44b456d57b1d0a11d67e933
parent 324c57b95b021845cb81efc3bc5a9eee548a5b47

am 324c57b9: am 21d3bd2d: am ec239ed1: am d94b24bc: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev

* commit '324c57b95b021845cb81efc3bc5a9eee548a5b47':
  Consolidate CallSubject history and dialog.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2bf4707..4055b44 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -174,8 +174,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>