diff options
Diffstat (limited to 'InCallUI/res/values')
| -rw-r--r-- | InCallUI/res/values/ids.xml | 1 | ||||
| -rw-r--r-- | InCallUI/res/values/styles.xml | 43 |
2 files changed, 3 insertions, 41 deletions
diff --git a/InCallUI/res/values/ids.xml b/InCallUI/res/values/ids.xml index c6ad2099c..accb8fb73 100644 --- a/InCallUI/res/values/ids.xml +++ b/InCallUI/res/values/ids.xml @@ -16,4 +16,5 @@ <resources> <item type="id" name="fadeState" /> + <item type="id" name="view_tag_callcard_actual_height" /> </resources> diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml index e16d72cb4..11d636261 100644 --- a/InCallUI/res/values/styles.xml +++ b/InCallUI/res/values/styles.xml @@ -70,43 +70,12 @@ <item name="android:textOff">@null</item> </style> - <style name="InCallAnimationStyle" parent="@android:style/Animation.Activity"> - <!-- Suppress task-to-task animation happening during the transition from - OutgoingCallBroadcaster (and SipOptionHandler) to InCallActivity. - The transition unexpectedly happens during the transition (inside the phone task), - because InCallActivity is using android:launchMode="singleInstance". - - - taskOpenEnterAnimation/taskOpenExitAnimation is used for the first time - InCallActivity instance is created. - - - taskToFrontEnterAnimation/taskToFrontExitAnimation is used when InCallActivity - is already available. - (Note that InCallActivity won't be destroyed once it is created) - - TODO: try removing the flag instead --> - <item name="android:taskOpenEnterAnimation">@null</item> - <item name="android:taskOpenExitAnimation">@anim/activity_open_exit</item> - <item name="android:taskToFrontEnterAnimation">@anim/activity_open_enter</item> - <item name="android:taskToFrontExitAnimation">@anim/activity_open_exit</item> - </style> - - <style name="OutgoingCallAnimationStyle" parent="@android:style/Animation.Activity"> - <item name="android:taskOpenEnterAnimation">@null</item> - <item name="android:taskOpenExitAnimation">@null</item> - <item name="android:activityOpenEnterAnimation">@null</item> - <item name="android:activityOpenExitAnimation">@null</item> - <item name="android:activityCloseEnterAnimation">@null</item> - <item name="android:activityCloseExitAnimation">@null</item> - <item name="android:taskToFrontEnterAnimation">@null</item> - <item name="android:taskToFrontExitAnimation">@null</item> - </style> - <!-- Theme for the InCallActivity activity. Should have a transparent background for the circular reveal animation for a new outgoing call to work correctly. We don't just use Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the InCallActivity to have the correct Material style. --> <style name="Theme.InCallScreen" parent="@android:style/Theme.Material.Light"> - <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item> + <item name="android:windowAnimationStyle">@null</item> <item name="android:windowIsTranslucent">true</item> <item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowContentOverlay">@null</item> @@ -116,15 +85,7 @@ <item name="android:popupMenuStyle">@style/InCallPopupMenuStyle</item> <item name="android:actionBarStyle">@style/InCallActionBarStyle</item> <item name="android:buttonStyleToggle">@style/InCallCompoundButton</item> - </style> - - <style name="Theme.CircularRevealAnimation" parent="@android:style/Theme.Material.Light"> - <item name="android:windowIsTranslucent">true</item> - <item name="android:windowContentOverlay">@null</item> - <item name="android:windowNoTitle">true</item> - <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> - <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:windowAnimationStyle">@null</item> + <item name="android:alertDialogTheme">@android:style/Theme.Material.Light.Dialog.Alert</item> </style> <style name="InCallPopupMenuStyle" parent="@android:style/Theme.Material.Light"> |