diff options
| author | Sai Cheemalapati <saicheems@google.com> | 2014-06-19 12:31:40 -0700 |
|---|---|---|
| committer | Sai Cheemalapati <saicheems@google.com> | 2014-06-20 14:55:45 -0700 |
| commit | f5fc99dfa667f346b95aa274d6c6f42c1f8a4515 (patch) | |
| tree | f7b90f7c68df48ac1c8aeeec2540439f49278a08 /res | |
| parent | 56444f96da37934839c788f2a74cbb5d8193c552 (diff) | |
| download | android_packages_apps_ContactsCommon-f5fc99dfa667f346b95aa274d6c6f42c1f8a4515.tar.gz android_packages_apps_ContactsCommon-f5fc99dfa667f346b95aa274d6c6f42c1f8a4515.tar.bz2 android_packages_apps_ContactsCommon-f5fc99dfa667f346b95aa274d6c6f42c1f8a4515.zip | |
Update Emergency Dialer to match Dialer (2/7).
Emergency dialer style updated to match style in Dialer and
InCallUI.
Moved all dialpad resources to PhoneCommon.
Change-Id: I5741364301c50770fd082758ef81fc79fd7c3b73
Diffstat (limited to 'res')
26 files changed, 0 insertions, 665 deletions
diff --git a/res/anim/dialpad_slide_in_bottom.xml b/res/anim/dialpad_slide_in_bottom.xml deleted file mode 100644 index 07748b5e..00000000 --- a/res/anim/dialpad_slide_in_bottom.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_slow_in" - android:duration="@integer/dialpad_slide_in_duration" - android:fromYDelta="67%p" - android:toYDelta="0" /> diff --git a/res/anim/dialpad_slide_in_right.xml b/res/anim/dialpad_slide_in_right.xml deleted file mode 100644 index d87e82ad..00000000 --- a/res/anim/dialpad_slide_in_right.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2014, 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:fromXDelta="100%p" - android:toXDelta="0" - android:interpolator="@android:anim/decelerate_interpolator" - android:duration="@integer/dialpad_slide_in_duration"/> diff --git a/res/anim/dialpad_slide_out_bottom.xml b/res/anim/dialpad_slide_out_bottom.xml deleted file mode 100644 index c80c8edc..00000000 --- a/res/anim/dialpad_slide_out_bottom.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:interpolator="@android:interpolator/fast_out_linear_in" - android:duration="@integer/dialpad_slide_out_duration" - android:fromYDelta="0" - android:toYDelta="80%p" /> diff --git a/res/anim/dialpad_slide_out_right.xml b/res/anim/dialpad_slide_out_right.xml deleted file mode 100644 index a29c1a0b..00000000 --- a/res/anim/dialpad_slide_out_right.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (c) 2014, 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. ---> - -<translate xmlns:android="http://schemas.android.com/apk/res/android" - android:fromXDelta="0" - android:toXDelta="100%" - android:interpolator="@android:anim/decelerate_interpolator" - android:duration="@integer/dialpad_slide_out_duration"/> diff --git a/res/drawable-hdpi/ic_dialpad_delete.png b/res/drawable-hdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index e588d90e..00000000 --- a/res/drawable-hdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_dialpad_vm.png b/res/drawable-hdpi/ic_dialpad_vm.png Binary files differdeleted file mode 100644 index 95013002..00000000 --- a/res/drawable-hdpi/ic_dialpad_vm.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_dialpad_delete.png b/res/drawable-mdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index 64a52d03..00000000 --- a/res/drawable-mdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_dialpad_vm.png b/res/drawable-mdpi/ic_dialpad_vm.png Binary files differdeleted file mode 100644 index f32d8bf1..00000000 --- a/res/drawable-mdpi/ic_dialpad_vm.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_dialpad_delete.png b/res/drawable-xhdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index 87bc1136..00000000 --- a/res/drawable-xhdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_dialpad_vm.png b/res/drawable-xhdpi/ic_dialpad_vm.png Binary files differdeleted file mode 100644 index 5d87c50a..00000000 --- a/res/drawable-xhdpi/ic_dialpad_vm.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_dialpad_delete.png b/res/drawable-xxhdpi/ic_dialpad_delete.png Binary files differdeleted file mode 100644 index 186508a9..00000000 --- a/res/drawable-xxhdpi/ic_dialpad_delete.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_dialpad_vm.png b/res/drawable-xxhdpi/ic_dialpad_vm.png Binary files differdeleted file mode 100644 index ac20fab0..00000000 --- a/res/drawable-xxhdpi/ic_dialpad_vm.png +++ /dev/null diff --git a/res/drawable/btn_dialpad_key.xml b/res/drawable/btn_dialpad_key.xml deleted file mode 100644 index a4cb0885..00000000 --- a/res/drawable/btn_dialpad_key.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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. ---> - -<ripple xmlns:android="http://schemas.android.com/apk/res/android" - android:color="?android:attr/colorControlHighlight" />
\ No newline at end of file diff --git a/res/layout-land/dialpad_key.xml b/res/layout-land/dialpad_key.xml deleted file mode 100644 index 6ff5c77f..00000000 --- a/res/layout-land/dialpad_key.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> - -<!-- A layout representing a single key in the dialpad --> -<com.android.contacts.common.dialpad.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/DialpadKeyButtonStyle" > - - <LinearLayout style="@style/DialpadKeyInternalLayoutStyle" - android:orientation="horizontal" - android:baselineAligned="false" - android:layout_gravity="right|center_vertical" > - - <!-- Note in the referenced styles that we assign hard widths to these components - because we want them to line up vertically when we arrange them in an MxN grid --> - - <com.android.contacts.common.dialpad.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle" - android:layout_gravity="right" - android:layout_marginBottom="0dp" - android:layout_marginRight="@dimen/dialpad_key_margin_right" /> - - <TextView - android:id="@+id/dialpad_key_letters" - style="@style/DialpadKeyLettersStyle" - android:layout_width="@dimen/dialpad_key_text_width" - android:layout_gravity="right|bottom" /> - </LinearLayout> -</com.android.contacts.common.dialpad.DialpadKeyButton> diff --git a/res/layout-land/dialpad_key_one.xml b/res/layout-land/dialpad_key_one.xml deleted file mode 100644 index 341f7a98..00000000 --- a/res/layout-land/dialpad_key_one.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 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. ---> -<com.android.contacts.common.dialpad.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/one" - style="@style/DialpadKeyButtonStyle"> - <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle" - android:orientation="horizontal" - android:baselineAligned="false" - android:layout_gravity="right|center_vertical" > - <com.android.contacts.common.dialpad.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle" - android:layout_gravity="right" - android:layout_marginBottom="0dp" - android:layout_marginRight="@dimen/dialpad_key_margin_right" /> - <RelativeLayout - android:layout_width="@dimen/dialpad_key_text_width" - android:layout_height="wrap_content" - android:layout_gravity="right|bottom" > - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top" - android:id="@+id/dialpad_key_voicemail" - android:src="@drawable/ic_dialpad_vm" - android:scaleType="fitCenter" - android:layout_centerInParent="true" - android:tint="@color/dialpad_secondary_text_color" /> - <!-- Place empty text view so vertical height is same as other dialpad keys. --> - <TextView style="@style/DialpadKeyLettersStyle" /> - </RelativeLayout> - </LinearLayout> -</com.android.contacts.common.dialpad.DialpadKeyButton> diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml deleted file mode 100644 index 90cbe184..00000000 --- a/res/layout/dialpad.xml +++ /dev/null @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 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. ---> - -<!-- Dialpad in the Phone app. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/dialpad" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:clipChildren="false"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> - <include layout="@layout/dialpad_key_one" /> - <include layout="@layout/dialpad_key" - android:id="@+id/two" - style="@style/DialpadKeyButtonStyle" /> - <include layout="@layout/dialpad_key" - android:id="@+id/three" - style="@style/DialpadKeyButtonStyle" /> - <Space style="@style/DialpadSpaceStyle" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> - <include layout="@layout/dialpad_key" - android:id="@+id/four" - style="@style/DialpadKeyButtonStyle" /> - <include layout="@layout/dialpad_key" - android:id="@+id/five" - style="@style/DialpadKeyButtonStyle" /> - <include layout="@layout/dialpad_key" - android:id="@+id/six" - style="@style/DialpadKeyButtonStyle" /> - <Space style="@style/DialpadSpaceStyle" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> - <include layout="@layout/dialpad_key" - android:id="@+id/seven" - style="@style/DialpadKeyButtonStyle" /> - <include layout="@layout/dialpad_key" - android:id="@+id/eight" - style="@style/DialpadKeyButtonStyle" /> - <include layout="@layout/dialpad_key" - android:id="@+id/nine" - style="@style/DialpadKeyButtonStyle" /> - <Space style="@style/DialpadSpaceStyle" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1" - android:orientation="horizontal"> - <Space style="@style/DialpadSpaceStyle" /> - <com.android.contacts.common.dialpad.DialpadKeyButton - android:id="@+id/star" - style="@style/DialpadKeyButtonStyle"> - <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle"> - <com.android.contacts.common.dialpad.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyStarStyle" /> - </LinearLayout> - </com.android.contacts.common.dialpad.DialpadKeyButton> - <include layout="@layout/dialpad_key" - android:id="@+id/zero" - style="@style/DialpadKeyButtonStyle" /> - <com.android.contacts.common.dialpad.DialpadKeyButton - android:id="@+id/pound" - style="@style/DialpadKeyButtonStyle"> - <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle"> - <com.android.contacts.common.dialpad.DialpadTextView - android:id="@id/dialpad_key_number" - style="@style/DialpadKeyPoundStyle" /> - </LinearLayout> - </com.android.contacts.common.dialpad.DialpadKeyButton> - <Space style="@style/DialpadSpaceStyle" /> - </LinearLayout> - <Space - android:layout_width="match_parent" - android:layout_height="@dimen/dialpad_bottom_key_height" /> -</LinearLayout> diff --git a/res/layout/dialpad_key.xml b/res/layout/dialpad_key.xml deleted file mode 100644 index 1d2d55a5..00000000 --- a/res/layout/dialpad_key.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> - -<!-- A layout representing a single key in the dialpad --> -<com.android.contacts.common.dialpad.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/DialpadKeyButtonStyle" > - - <LinearLayout style="@style/DialpadKeyInternalLayoutStyle"> - - <!-- Note in the referenced styles that we assign hard widths to these components - because we want them to line up vertically when we arrange them in an MxN grid --> - - <com.android.contacts.common.dialpad.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle" /> - - <TextView - android:id="@+id/dialpad_key_letters" - style="@style/DialpadKeyLettersStyle" /> - </LinearLayout> -</com.android.contacts.common.dialpad.DialpadKeyButton>
\ No newline at end of file diff --git a/res/layout/dialpad_key_one.xml b/res/layout/dialpad_key_one.xml deleted file mode 100644 index 2365e6ef..00000000 --- a/res/layout/dialpad_key_one.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 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. ---> -<com.android.contacts.common.dialpad.DialpadKeyButton - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/one" - style="@style/DialpadKeyButtonStyle"> - <LinearLayout - style="@style/DialpadKeyInternalLayoutStyle"> - <com.android.contacts.common.dialpad.DialpadTextView - android:id="@+id/dialpad_key_number" - style="@style/DialpadKeyNumberStyle" /> - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" > - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingTop="@dimen/dialpad_voicemail_icon_padding_top" - android:id="@+id/dialpad_key_voicemail" - android:src="@drawable/ic_dialpad_vm" - android:scaleType="fitCenter" - android:layout_centerInParent="true" - android:tint="@color/dialpad_secondary_text_color" /> - <!-- Place empty text view so vertical height is same as other dialpad keys. --> - <TextView style="@style/DialpadKeyLettersStyle" /> - </RelativeLayout> - </LinearLayout> -</com.android.contacts.common.dialpad.DialpadKeyButton> diff --git a/res/layout/dialpad_view.xml b/res/layout/dialpad_view.xml deleted file mode 100644 index 7dfbff67..00000000 --- a/res/layout/dialpad_view.xml +++ /dev/null @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 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. ---> -<view class="com.android.contacts.common.dialpad.DialpadView" - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/dialpad_view" - android:layout_height="match_parent" - android:layout_width="match_parent" - android:layout_gravity="bottom" - android:orientation="vertical" - android:layoutDirection="ltr" - android:background="@color/background_dialpad" - android:clickable="true" > - - <!-- Text field and possibly soft menu button above the keypad where - the digits are displayed. --> - <LinearLayout - android:id="@+id/digits_container" - android:layout_width="match_parent" - android:layout_height="@dimen/dialpad_digits_height" - android:orientation="horizontal"> - - <ImageButton android:id="@+id/dialpad_overflow" - android:background="@drawable/btn_dialpad_key" - android:src="@drawable/ic_overflow_menu" - android:tint="@color/dialpad_icon_tint" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:paddingLeft="@dimen/dialpad_digits_padding" - android:paddingRight="@dimen/dialpad_digits_menu_right_padding" - android:contentDescription="@string/description_dialpad_overflow" - android:gravity="center" - android:visibility="gone" /> - - <view class="com.android.contacts.common.dialpad.DigitsEditText" - android:id="@+id/digits" - android:layout_width="0dp" - android:layout_height="match_parent" - android:scrollHorizontally="true" - android:singleLine="true" - android:layout_weight="1" - android:gravity="center" - android:background="@android:color/transparent" - android:maxLines="1" - android:textSize="@dimen/dialpad_digits_text_size" - android:freezesText="true" - android:focusableInTouchMode="true" - android:cursorVisible="false" - android:textColor="@color/dialpad_digits_text_color" - android:textCursorDrawable="@null" - android:fontFamily="sans-serif-light" - android:textStyle="normal" /> - - <ImageButton - android:id="@+id/deleteButton" - android:background="@drawable/btn_dialpad_key" - android:tint="@color/dialpad_icon_tint" - android:paddingLeft="@dimen/dialpad_digits_padding" - android:paddingRight="@dimen/dialpad_digits_padding" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:state_enabled="false" - android:contentDescription="@string/description_delete_button" - android:src="@drawable/ic_dialpad_delete" /> - </LinearLayout> - - <View - android:layout_width="match_parent" - android:layout_height="1dp" - android:background="#e3e3e3" /> - - <Space - android:layout_width="match_parent" - android:layout_height="14dp" /> - - <include layout="@layout/dialpad" /> - - <Space - android:layout_width="match_parent" - android:layout_height="8dp" /> - -</view> diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml deleted file mode 100644 index 96547f04..00000000 --- a/res/values-land/dimens.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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. - --> -<resources> - <dimen name="dialpad_key_margin_right">10dp</dimen> - <dimen name="dialpad_key_text_width">25dp</dimen> -</resources> diff --git a/res/values/animation_constants.xml b/res/values/animation_constants.xml index 36a078a3..9e59194d 100644 --- a/res/values/animation_constants.xml +++ b/res/values/animation_constants.xml @@ -15,8 +15,5 @@ ~ limitations under the License --> <resources> - <integer name="dialpad_slide_in_duration">532</integer> - <integer name="dialpad_slide_out_duration">257</integer> - <integer name="floating_action_button_animation_duration">250</integer> </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 524df941..64397caf 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -78,8 +78,4 @@ <declare-styleable name="Favorites"> <attr name="favorites_padding_bottom" format="dimension"/> </declare-styleable> - - <declare-styleable name="Dialpad"> - <attr name="dialpad_key_button_touch_tint" format="color"/> - </declare-styleable> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 6b31491b..5e3f4b88 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -88,15 +88,6 @@ <color name="actionbar_text_color">#ffffff</color> <color name="actionbar_unselected_text_color">#a6ffffff</color> - <!-- Colors for the dialpad --> - <color name="background_dialpad">#fcfcfc</color> - <color name="background_dialpad_pressed">#ececec</color> - <color name="dialpad_primary_text_color">#26c6da</color> - <color name="dialpad_secondary_text_color">#999999</color> - <color name="dialpad_digits_text_color">#666666</color> - <color name="dialpad_separator_line_color">#dadada</color> - <color name="dialpad_icon_tint">#b3b3b3</color> - <!-- Text color of the search box text as entered by user --> <color name="searchbox_text_color">#000000</color> <!-- Background color of the search box --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8c41d2a6..cf2f944d 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -117,29 +117,6 @@ <!-- Size of text in tabs. --> <dimen name="tab_text_size">14sp</dimen> - <!-- Text dimensions for dialpad keys --> - <dimen name="dialpad_key_numbers_size">36sp</dimen> - <dimen name="dialpad_key_letters_size">8sp</dimen> - <dimen name="dialpad_key_pound_size">23sp</dimen> - <dimen name="dialpad_key_star_size">28sp</dimen> - <dimen name="dialpad_key_height">64dp</dimen> - <dimen name="dialpad_key_number_margin_bottom">2dp</dimen> - <dimen name="dialpad_symbol_margin_bottom">13dp</dimen> - <!-- The bottom row of the dialpad is slightly taller to account for the dial button --> - <dimen name="dialpad_bottom_key_height">65dp</dimen> - <dimen name="dialpad_key_plus_size">18sp</dimen> - <dimen name="dialpad_horizontal_padding">5dp</dimen> - <dimen name="dialpad_digits_text_size">36dp</dimen> - <dimen name="dialpad_digits_height">64dp</dimen> - <dimen name="dialpad_digits_padding">16dp</dimen> - <dimen name="dialpad_digits_menu_right_padding">10dp</dimen> - <dimen name="dialpad_center_margin">3dp</dimen> - <dimen name="dialpad_button_margin">2dp</dimen> - <dimen name="dialpad_voicemail_icon_padding_top">2dp</dimen> - - - <dimen name="dialpad_key_button_translate_y">100dp</dimen> - <!-- Padding around the icon in the search box. --> <dimen name="search_box_icon_margin">4dp</dimen> <!-- Size of the icon (voice search, close search) in the search box. --> diff --git a/res/values/strings.xml b/res/values/strings.xml index afbb4d65..746460fc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -733,78 +733,10 @@ a ren't members of any other group. [CHAR LIMIT=25] --> --> <string name="description_add_contact">Add contact</string> - <!-- String describing the overflow menu button in the dialpad --> - <string name="description_dialpad_overflow">More options</string> - - <!-- String describing the Delete/Backspace ImageButton - - Used by AccessibilityService to announce the purpose of the button. - --> - <string name="description_delete_button">backspace</string> - - <!-- String describing the button used to add a plus (+) symbol to the dialpad --> - <string name="description_image_button_plus">plus</string> - - <!-- String describing the Voicemail ImageButton - - Used by AccessibilityService to announce the purpose of the button. - --> - <string name="description_voicemail_button">voicemail</string> - <!-- The font-family to use for tab text. Do not translate. --> <string name="tab_font_family">sans-serif</string> - <!-- The digit to be displayed on the 0 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_0_number">0</string> - <!-- The digit to be displayed on the 1 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_1_number">1</string> - <!-- The digit to be displayed on the 2 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_2_number">2</string> - <!-- The digit to be displayed on the 3 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_3_number">3</string> - <!-- The digit to be displayed on the 4 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_4_number">4</string> - <!-- The digit to be displayed on the 5 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_5_number">5</string> - <!-- The digit to be displayed on the 6 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_6_number">6</string> - <!-- The digit to be displayed on the 7 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_7_number">7</string> - <!-- The digit to be displayed on the 8 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_8_number">8</string> - <!-- The digit to be displayed on the 9 key of the dialpad [CHAR LIMIT=1]--> - <string name="dialpad_9_number">9</string> - <!-- Do not translate. --> - <string name="dialpad_star_number">*</string> - <!-- Do not translate. --> - <string name="dialpad_pound_number">#</string> - - <!-- Do not translate. --> - <string name="dialpad_0_letters">+</string> - <!-- Do not translate. --> - <string name="dialpad_1_letters"></string> - <!-- Do not translate. --> - <string name="dialpad_2_letters">ABC</string> - <!-- Do not translate. --> - <string name="dialpad_3_letters">DEF</string> - <!-- Do not translate. --> - <string name="dialpad_4_letters">GHI</string> - <!-- Do not translate. --> - <string name="dialpad_5_letters">JKL</string> - <!-- Do not translate. --> - <string name="dialpad_6_letters">MNO</string> - <!-- Do not translate. --> - <string name="dialpad_7_letters">PQRS</string> - <!-- Do not translate. --> - <string name="dialpad_8_letters">TUV</string> - <!-- Do not translate. --> - <string name="dialpad_9_letters">WXYZ</string> - <!-- Do not translate. --> - <string name="dialpad_star_letters"></string> - <!-- Do not translate. --> - <string name="dialpad_pound_letters"></string> - <!-- Attribution of a contact status update, when the time of update is unknown --> <string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 701bc2d8..908be22f 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -88,70 +88,4 @@ background and text color. See also android:style/Widget.Holo.TextView.ListSepar <item name="android:windowNoDisplay">true</item> <item name="android:windowIsFloating">true</item> </style> - - <style name="DialpadSpaceStyle"> - <item name="android:layout_width">0dp</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_weight">3</item> - </style> - - <style name="DialpadKeyNumberStyle"> - <item name="android:textColor">@color/dialpad_primary_text_color</item> - <item name="android:textSize">@dimen/dialpad_key_numbers_size</item> - <item name="android:fontFamily">sans-serif-light</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginBottom">@dimen/dialpad_key_number_margin_bottom</item> - <item name="android:gravity">center</item> - </style> - - <style name="DialpadKeyStarStyle"> - <item name="android:textColor">@color/dialpad_secondary_text_color</item> - <item name="android:textSize">@dimen/dialpad_key_star_size</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item> - <item name="android:gravity">center</item> - </style> - - <style name="DialpadKeyPoundStyle"> - <item name="android:textColor">@color/dialpad_secondary_text_color</item> - <item name="android:textSize">@dimen/dialpad_key_pound_size</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginBottom">@dimen/dialpad_symbol_margin_bottom</item> - <item name="android:gravity">center</item> - </style> - - <style name="DialpadKeyLettersStyle"> - <item name="android:textColor">@color/dialpad_secondary_text_color</item> - <item name="android:textSize">@dimen/dialpad_key_letters_size</item> - <item name="android:fontFamily">sans-serif-medium</item> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:gravity">center_horizontal</item> - </style> - - <style name="DialpadKeyButtonStyle"> - <item name="android:soundEffectsEnabled">false</item> - <item name="android:clickable">true</item> - <item name="android:layout_width">0dp</item> - <item name="android:layout_height">match_parent</item> - <item name="android:layout_weight">13</item> - <item name="android:minHeight">@dimen/dialpad_key_height</item> - <item name="android:background">@drawable/btn_dialpad_key</item> - <item name="android:focusable">true</item> - </style> - - <style name="DialpadBottomKeyButtonStyle" parent="DialpadKeyButtonStyle"> - <item name="android:layout_height">@dimen/dialpad_bottom_key_height</item> - </style> - - <style name="DialpadKeyInternalLayoutStyle"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_gravity">center</item> - <item name="android:gravity">center</item> - <item name="android:orientation">vertical</item> - </style> </resources> |
