diff options
| author | Christine Chen <christinech@google.com> | 2013-10-16 10:42:15 -0700 |
|---|---|---|
| committer | Christine Chen <christinech@google.com> | 2013-10-16 11:02:29 -0700 |
| commit | 1bd21c5ffed9c85c78d6d63ce25afa779fab8e5a (patch) | |
| tree | 09dd3dbe70ad2e89096d82a434503d7fa959bae4 /InCallUI/res/values/styles.xml | |
| parent | 952dab730257d7392f5594b7f5660090a679107d (diff) | |
Removes private resources from InCallUi
Bug: 11244110
Change-Id: I88471a7d1e164ac7e464f199f1c0c36fa3c0876f
Diffstat (limited to 'InCallUI/res/values/styles.xml')
| -rw-r--r-- | InCallUI/res/values/styles.xml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml index 457065320..91090b844 100644 --- a/InCallUI/res/values/styles.xml +++ b/InCallUI/res/values/styles.xml @@ -102,7 +102,7 @@ <item name="android:layout_marginEnd">5dip</item> </style> - <style name="InCallAnimationStyle" parent="@*android:style/Animation.Holo.Activity"> + <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), @@ -116,10 +116,10 @@ (Note that InCallActivity won't be destroyed once it is created) TODO: try removing the flag instead --> - <item name="*android:taskOpenEnterAnimation">@*android:anim/activity_open_enter</item> - <item name="*android:taskOpenExitAnimation">@*android:anim/activity_open_exit</item> - <item name="*android:taskToFrontEnterAnimation">@*android:anim/activity_open_enter</item> - <item name="*android:taskToFrontExitAnimation">@*android:anim/activity_open_exit</item> + <item name="android:taskOpenEnterAnimation">@anim/activity_open_enter</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> <!-- Theme for the InCallActivity activity. This gives us a totally black @@ -128,8 +128,7 @@ from the InCallActivity to have the correct holo style. --> <style name="Theme.InCallScreen" parent="@android:style/Theme.Holo.NoActionBar"> <item name="android:windowBackground">@android:color/black</item> - - <item name="*android:windowAnimationStyle">@style/InCallAnimationStyle</item> + <item name="android:windowAnimationStyle">@style/InCallAnimationStyle</item> </style> <style name="DialpadButtonStyle"> |