diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-08-13 15:19:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 15:19:53 +0000 |
| commit | 0b216b048a9b9fef9250aa7a3ec132be54245106 (patch) | |
| tree | b3a7cc27e7cec3db3112d0a4353839ac86757783 | |
| parent | 104bf0ac0e6b917f980fb99b249d567a1792ad2b (diff) | |
| parent | 3faa80822a4f0a205568f660bf8de09913b86e01 (diff) | |
| download | packages_apps_Contacts-0b216b048a9b9fef9250aa7a3ec132be54245106.tar.gz packages_apps_Contacts-0b216b048a9b9fef9250aa7a3ec132be54245106.tar.bz2 packages_apps_Contacts-0b216b048a9b9fef9250aa7a3ec132be54245106.zip | |
am 3faa8082: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev
* commit '3faa80822a4f0a205568f660bf8de09913b86e01':
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 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> |