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 | |
parent | 952dab730257d7392f5594b7f5660090a679107d (diff) |
Removes private resources from InCallUi
Bug: 11244110
Change-Id: I88471a7d1e164ac7e464f199f1c0c36fa3c0876f
Diffstat (limited to 'InCallUI/res')
27 files changed, 153 insertions, 19 deletions
diff --git a/InCallUI/res/anim/activity_open_enter.xml b/InCallUI/res/anim/activity_open_enter.xml new file mode 100644 index 000000000..303b9ddc0 --- /dev/null +++ b/InCallUI/res/anim/activity_open_enter.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:shareInterpolator="false" + android:zAdjustment="top"> + <alpha android:fromAlpha="0.0" android:toAlpha="1.0" + android:interpolator="@anim/decelerate_cubic" + android:fillEnabled="true" + android:fillBefore="false" android:fillAfter="true" + android:duration="300"/> + <scale android:fromXScale=".8" android:toXScale="1.0" + android:fromYScale=".8" android:toYScale="1.0" + android:pivotX="50%p" android:pivotY="50%p" + android:interpolator="@anim/decelerate_cubic" + android:fillEnabled="true" + android:fillBefore="false" android:fillAfter="true" + android:duration="300"/> +</set>
\ No newline at end of file diff --git a/InCallUI/res/anim/activity_open_exit.xml b/InCallUI/res/anim/activity_open_exit.xml new file mode 100644 index 000000000..afa7c5e72 --- /dev/null +++ b/InCallUI/res/anim/activity_open_exit.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2009, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<set xmlns:android="http://schemas.android.com/apk/res/android" + android:background="#ff000000" android:zAdjustment="normal"> + <alpha android:fromAlpha="1.0" android:toAlpha="0.0" + android:fillEnabled="true" android:fillBefore="false" android:fillAfter="true" + android:interpolator="@anim/decelerate_quint" + android:duration="300"/> +</set>
\ No newline at end of file diff --git a/InCallUI/res/anim/decelerate_cubic.xml b/InCallUI/res/anim/decelerate_cubic.xml new file mode 100644 index 000000000..f98809165 --- /dev/null +++ b/InCallUI/res/anim/decelerate_cubic.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" + android:factor="1.5" /> diff --git a/InCallUI/res/anim/decelerate_quint.xml b/InCallUI/res/anim/decelerate_quint.xml new file mode 100644 index 000000000..ff2d5a9d0 --- /dev/null +++ b/InCallUI/res/anim/decelerate_quint.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<decelerateInterpolator xmlns:android="http://schemas.android.com/apk/res/android" + android:factor="2.5" /> diff --git a/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png Binary files differnew file mode 100644 index 000000000..0eff695d8 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ab_transparent_dark_holo.9.png diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_glowdot.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 000000000..983c45e2c --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_lockscreen_glowdot.png diff --git a/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png Binary files differnew file mode 100644 index 000000000..58a5f16df --- /dev/null +++ b/InCallUI/res/drawable-hdpi/ic_lockscreen_handle_pressed.png diff --git a/InCallUI/res/drawable-hdpi/picture_emergency.png b/InCallUI/res/drawable-hdpi/picture_emergency.png Binary files differnew file mode 100644 index 000000000..0e13a4385 --- /dev/null +++ b/InCallUI/res/drawable-hdpi/picture_emergency.png diff --git a/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png Binary files differnew file mode 100644 index 000000000..ad980b13f --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ab_transparent_dark_holo.9.png diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_glowdot.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 000000000..056c3f175 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_lockscreen_glowdot.png diff --git a/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png Binary files differnew file mode 100644 index 000000000..0187a02af --- /dev/null +++ b/InCallUI/res/drawable-mdpi/ic_lockscreen_handle_pressed.png diff --git a/InCallUI/res/drawable-mdpi/picture_emergency.png b/InCallUI/res/drawable-mdpi/picture_emergency.png Binary files differnew file mode 100644 index 000000000..a224b8000 --- /dev/null +++ b/InCallUI/res/drawable-mdpi/picture_emergency.png diff --git a/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png Binary files differnew file mode 100644 index 000000000..719b9234d --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ab_transparent_dark_holo.9.png diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_glowdot.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 000000000..cbd039afd --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_lockscreen_glowdot.png diff --git a/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png Binary files differnew file mode 100644 index 000000000..2d28009f2 --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/ic_lockscreen_handle_pressed.png diff --git a/InCallUI/res/drawable-xhdpi/picture_emergency.png b/InCallUI/res/drawable-xhdpi/picture_emergency.png Binary files differnew file mode 100644 index 000000000..08b421eef --- /dev/null +++ b/InCallUI/res/drawable-xhdpi/picture_emergency.png diff --git a/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png b/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png Binary files differnew file mode 100644 index 000000000..84155ccf5 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ab_transparent_dark_holo.9.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_glowdot.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_glowdot.png Binary files differnew file mode 100644 index 000000000..c0edd91c8 --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_glowdot.png diff --git a/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png Binary files differnew file mode 100644 index 000000000..7528064ea --- /dev/null +++ b/InCallUI/res/drawable-xxhdpi/ic_lockscreen_handle_pressed.png diff --git a/InCallUI/res/drawable/ic_in_call_touch_handle.xml b/InCallUI/res/drawable/ic_in_call_touch_handle.xml index e657e92ed..7e234b62b 100644 --- a/InCallUI/res/drawable/ic_in_call_touch_handle.xml +++ b/InCallUI/res/drawable/ic_in_call_touch_handle.xml @@ -28,6 +28,6 @@ android:state_enabled="true" android:state_active="true" android:state_focused="false" - android:drawable="@*android:drawable/ic_lockscreen_handle_pressed" /> + android:drawable="@drawable/ic_lockscreen_handle_pressed" /> </selector> diff --git a/InCallUI/res/drawable/ic_lockscreen_outerring.xml b/InCallUI/res/drawable/ic_lockscreen_outerring.xml new file mode 100644 index 000000000..d64825db0 --- /dev/null +++ b/InCallUI/res/drawable/ic_lockscreen_outerring.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" + > + <size android:height="@dimen/glowpadview_outerring_diameter" + android:width="@dimen/glowpadview_outerring_diameter" /> + <solid android:color="#00000000" /> + <stroke android:color="#1affffff" android:width="2dp" /> +</shape> diff --git a/InCallUI/res/layout/answer_fragment.xml b/InCallUI/res/layout/answer_fragment.xml index ee2b0767c..15c2093eb 100644 --- a/InCallUI/res/layout/answer_fragment.xml +++ b/InCallUI/res/layout/answer_fragment.xml @@ -32,13 +32,13 @@ dc:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions" dc:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions" dc:handleDrawable="@drawable/ic_in_call_touch_handle" - dc:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring" + dc:outerRingDrawable="@drawable/ic_lockscreen_outerring" dc:outerRadius="@dimen/glowpadview_target_placement_radius" dc:innerRadius="@dimen/glowpadview_inner_radius" dc:snapMargin="@dimen/glowpadview_snap_margin" dc:feedbackCount="1" dc:vibrationDuration="20" dc:glowRadius="@dimen/glowpadview_glow_radius" - dc:pointDrawable="@*android:drawable/ic_lockscreen_glowdot" + dc:pointDrawable="@drawable/ic_lockscreen_glowdot" dc:allowScaling="true" /> diff --git a/InCallUI/res/layout/conference_manager_fragment.xml b/InCallUI/res/layout/conference_manager_fragment.xml index f1fbfdfac..a8fda2c25 100644 --- a/InCallUI/res/layout/conference_manager_fragment.xml +++ b/InCallUI/res/layout/conference_manager_fragment.xml @@ -54,7 +54,7 @@ android:id="@+id/manageConferenceHeader" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@*android:drawable/ab_transparent_dark_holo"> + android:background="@drawable/ab_transparent_dark_holo"> <LinearLayout android:id="@+id/manage_done" @@ -73,7 +73,7 @@ <TextView android:layout_width="match_parent" android:layout_height="?android:attr/actionBarSize" - style="@*android:style/TextAppearance.Holo.Widget.ActionBar.Title" + style="@android:style/TextAppearance.Holo.Widget.ActionBar.Title" android:gravity="center_vertical" android:text="@string/manageConferenceLabel"/> </LinearLayout> diff --git a/InCallUI/res/values/array.xml b/InCallUI/res/values/array.xml index 44d8d7086..c47164532 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 204657bc1..ebfb93494 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 7c588b34a..62a1d5bfa 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 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"> |