commit ea1df4a6d77bc9d3f8c7e5f58f4ddc22a143a641
author Tyler Gunn <tgunn@google.com> Thu Aug 13 15:26:54 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 13 15:26:54 2015 +0000
tree aa6d6f7f6f455dfc1764a3b19e62543b62ccb197
parent 7e7a06a4e90c8b6dd0d80154ded7c72ea4e86ccb
parent 0b216b048a9b9fef9250aa7a3ec132be54245106

am 0b216b04: am 3faa8082: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev

* commit '0b216b048a9b9fef9250aa7a3ec132be54245106':
  Consolidate CallSubject history and dialog.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ed0acd..68adf0f 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>