Removes private resources from InCallUi
Bug: 11244110
Change-Id: I88471a7d1e164ac7e464f199f1c0c36fa3c0876f
diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml
index 44d8d70..c471645 100644
--- a/InCallUI/res/values/array.xml
+++ b/InCallUI/res/values/array.xml
@@ -70,9 +70,9 @@
<item>@null</item>"
</array>
<array name="incoming_call_widget_3way_direction_descriptions">
- <item>@*android:string/description_direction_right</item>
- <item>@*android:string/description_direction_up</item>
- <item>@*android:string/description_direction_left</item>
+ <item>@string/description_direction_right</item>
+ <item>@string/description_direction_up</item>
+ <item>@string/description_direction_left</item>
<item>@null</item>
</array>
@@ -93,9 +93,9 @@
<item>@null</item>"
</array>
<array name="incoming_call_widget_2way_direction_descriptions">
- <item>@*android:string/description_direction_right</item>
+ <item>@string/description_direction_right</item>
<item>@null</item>
- <item>@*android:string/description_direction_left</item>
+ <item>@string/description_direction_left</item>
<item>@null</item>
</array>
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index 204657b..ebfb934 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -98,8 +98,6 @@
So, (94 - 38)/2 ==> 28dp -->
<dimen name="incoming_call_widget_asset_margin">28dp</dimen>
-
-
<!-- Size of alarm alert outer ring. -->
<dimen name="glowpadview_outerring_diameter">270dip</dimen>
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml
index 7c588b3..62a1d5b 100755
--- a/InCallUI/res/values/strings.xml
+++ b/InCallUI/res/values/strings.xml
@@ -1425,6 +1425,13 @@
<!-- Description of the decline on target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
<string name="description_target_decline">Decline</string>
+ <!-- Description of the up direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
+ <string name="description_direction_up">Slide up for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
+ <!-- Description of the left direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
+ <string name="description_direction_left">"Slide left for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
+ <!-- Description of the right direction in which one can to slide the handle in the phone answer screen. [CHAR LIMIT=NONE] -->
+ <string name="description_direction_right">Slide right for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
+
<!-- Dialog title for the vibration settings for voicemail notifications [CHAR LIMIT=40] -->
<string name="voicemail_notification_vibrate_when_title" msgid="8731372580674292759">Vibrate</string>
<!-- Dialog title for the vibration settings for voice mail notifications [CHAR LIMIT=40]-->
@@ -1474,4 +1481,7 @@
<!-- Label for "Manage conference call" panel [CHAR LIMIT=40] -->
<string name="manageConferenceLabel">Manage conference call</string>
+
+ <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+ <string name="emergency_call_dialog_number_for_display">Emergency number</string>
</resources>
diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml
index 4570653..91090b8 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">