diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-08-13 15:33:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 15:33:18 +0000 |
| commit | 324c57b95b021845cb81efc3bc5a9eee548a5b47 (patch) | |
| tree | 06164b3b1a291821965938028c7202a9a91c6768 | |
| parent | f92f11b9b12e38b57ea6e3a5f383295cfd00014f (diff) | |
| parent | 21d3bd2d697671c7d0259b0e2f96e617475716d5 (diff) | |
am 21d3bd2d: am ec239ed1: am d94b24bc: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev
* commit '21d3bd2d697671c7d0259b0e2f96e617475716d5':
Consolidate CallSubject history and dialog.
| -rw-r--r-- | AndroidManifest.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2bf47071f..4055b4441 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> |