commit ec239ed1814d97037bf17f68f887fbdcef22e75d
author Tyler Gunn <tgunn@google.com> Thu Aug 13 15:19:52 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 13 15:19:52 2015 +0000
tree c183a31d2025d5b6910e1f4a2138b969459bd78b
parent 4422da16b43847147599e4677667ab6caea69702
parent d94b24bc13c12bfa10d48614f27adae54fdd6902

am d94b24bc: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev

* commit 'd94b24bc13c12bfa10d48614f27adae54fdd6902':
  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>