diff options
| author | Tyler Gunn <tgunn@google.com> | 2015-08-13 15:19:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 15:19:52 +0000 |
| commit | ec239ed1814d97037bf17f68f887fbdcef22e75d (patch) | |
| tree | c183a31d2025d5b6910e1f4a2138b969459bd78b | |
| parent | 4422da16b43847147599e4677667ab6caea69702 (diff) | |
| parent | d94b24bc13c12bfa10d48614f27adae54fdd6902 (diff) | |
am d94b24bc: Merge "Consolidate CallSubject history and dialog." into mnc-dr-dev
* commit 'd94b24bc13c12bfa10d48614f27adae54fdd6902':
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> |