diff options
author | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
---|---|---|
committer | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
commit | cded3beaf28a703e1ef8f71bbc6836e6806c3736 (patch) | |
tree | c1b5e8199b5996fc848e7455d04126b9cdbb3c39 /java/com/android/incallui/res | |
parent | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (diff) |
Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"
This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.
Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.
Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
Diffstat (limited to 'java/com/android/incallui/res')
-rw-r--r-- | java/com/android/incallui/res/drawable-hdpi/img_conference.png | bin | 0 -> 7037 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable-mdpi/img_conference.png | bin | 0 -> 4629 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable-xhdpi/img_conference.png | bin | 0 -> 9517 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable-xxhdpi/img_conference.png | bin | 0 -> 16306 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png | bin | 0 -> 19584 bytes | |||
-rw-r--r-- | java/com/android/incallui/res/drawable/img_conference_automirrored.xml | 21 | ||||
-rw-r--r-- | java/com/android/incallui/res/values-ca/strings.xml | 2 | ||||
-rw-r--r-- | java/com/android/incallui/res/values-mcc262-mnc01/strings.xml | 32 | ||||
-rw-r--r-- | java/com/android/incallui/res/values-uz/strings.xml | 2 | ||||
-rw-r--r-- | java/com/android/incallui/res/values/dimens.xml | 2 | ||||
-rw-r--r-- | java/com/android/incallui/res/values/styles.xml | 9 |
11 files changed, 24 insertions, 44 deletions
diff --git a/java/com/android/incallui/res/drawable-hdpi/img_conference.png b/java/com/android/incallui/res/drawable-hdpi/img_conference.png Binary files differnew file mode 100644 index 000000000..3d9f683a5 --- /dev/null +++ b/java/com/android/incallui/res/drawable-hdpi/img_conference.png diff --git a/java/com/android/incallui/res/drawable-mdpi/img_conference.png b/java/com/android/incallui/res/drawable-mdpi/img_conference.png Binary files differnew file mode 100644 index 000000000..0694dbd55 --- /dev/null +++ b/java/com/android/incallui/res/drawable-mdpi/img_conference.png diff --git a/java/com/android/incallui/res/drawable-xhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xhdpi/img_conference.png Binary files differnew file mode 100644 index 000000000..b0dbcc2dc --- /dev/null +++ b/java/com/android/incallui/res/drawable-xhdpi/img_conference.png diff --git a/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png Binary files differnew file mode 100644 index 000000000..a8dba5ed0 --- /dev/null +++ b/java/com/android/incallui/res/drawable-xxhdpi/img_conference.png diff --git a/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png b/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png Binary files differnew file mode 100644 index 000000000..eb42b5552 --- /dev/null +++ b/java/com/android/incallui/res/drawable-xxxhdpi/img_conference.png diff --git a/java/com/android/incallui/res/drawable/img_conference_automirrored.xml b/java/com/android/incallui/res/drawable/img_conference_automirrored.xml new file mode 100644 index 000000000..78b2876bc --- /dev/null +++ b/java/com/android/incallui/res/drawable/img_conference_automirrored.xml @@ -0,0 +1,21 @@ +<?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 + --> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:autoMirrored="true" + android:src="@drawable/img_conference"/>
\ No newline at end of file diff --git a/java/com/android/incallui/res/values-ca/strings.xml b/java/com/android/incallui/res/values-ca/strings.xml index ad34b00ef..5148db540 100644 --- a/java/com/android/incallui/res/values-ca/strings.xml +++ b/java/com/android/incallui/res/values-ca/strings.xml @@ -136,6 +136,6 @@ <string name="generic_conference_call_name" msgid="1546941472424243894">"En una trucada"</string> <string name="video_call_wifi_to_lte_handover_toast" msgid="2495974172657183700">"S\'està continuant la trucada mitjançant dades mòbils…"</string> <string name="video_call_lte_to_wifi_failed_title" msgid="2793524281399509056">"No s\'ha pogut canviar a la xarxa Wi-Fi"</string> - <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videotrucada es mantindrà a la xarxa mòbil. És possible que s\'hi apliquin càrrecs de dades estàndard."</string> + <string name="video_call_lte_to_wifi_failed_message" msgid="5950700221126447109">"La videotrucada es mantindrà a la xarxa mòbil. És possible que s\'apliquin càrrecs de dades estàndard."</string> <string name="video_call_lte_to_wifi_failed_do_not_show" msgid="7609115874511223150">"No ho tornis a mostrar"</string> </resources> diff --git a/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml b/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml deleted file mode 100644 index 2679653a7..000000000 --- a/java/com/android/incallui/res/values-mcc262-mnc01/strings.xml +++ /dev/null @@ -1,32 +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 - --> - -<resources> - <!-- This is customization of wifi call notification only for DTAG of Germany. --> - <!-- The "label" of the in-call Notification for an ongoing call, which is being made over - Wi-Fi. [CHAR LIMIT=60] --> - <string name="notification_ongoing_call_wifi">Ongoing WLAN Call</string> - <!-- The "label" of the in-call Notification for an ongoing work call, which is being made - over Wi-Fi. [CHAR LIMIT=60] --> - <string name="notification_ongoing_work_call_wifi">Ongoing WLAN work call</string> - <!-- The "label" of the in-call Notification for an incoming ringing call, - which is being made over Wi-Fi. [CHAR LIMIT=60] --> - <string name="notification_incoming_call_wifi">Incoming WLAN Call</string> - <!-- The "label" of the in-call Notification for an incoming ringing work call, - which is being made over Wi-Fi. [CHAR LIMIT=60] --> - <string name="notification_incoming_work_call_wifi">Incoming WLAN work call</string> -</resources>
\ No newline at end of file diff --git a/java/com/android/incallui/res/values-uz/strings.xml b/java/com/android/incallui/res/values-uz/strings.xml index b04972ffd..38285015a 100644 --- a/java/com/android/incallui/res/values-uz/strings.xml +++ b/java/com/android/incallui/res/values-uz/strings.xml @@ -36,7 +36,7 @@ <string name="notification_ongoing_call_wifi" msgid="297183051021070949">"Chiquvchi Wi-Fi qo‘ng‘irog‘i"</string> <string name="notification_ongoing_work_call_wifi" msgid="6769311641293583197">"Chiquvchi Wi-Fi ishchi qo‘ng‘irog‘i"</string> <string name="notification_on_hold" msgid="7141827443379205682">"Kutmoqda"</string> - <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi chaqiruv"</string> + <string name="notification_incoming_call" msgid="7520580807513849283">"Kiruvchi qo‘ng‘iroq"</string> <string name="notification_incoming_call_with_photo" msgid="4360505044807517422">"Suratga ega kiruvchi chaqiruv"</string> <string name="notification_incoming_call_with_message" msgid="5608687985694956601">"Xabarga ega kiruvchi chaqiruv"</string> <string name="notification_incoming_call_with_location" msgid="4519498445081598767">"Joylashuv axborotiga ega kiruvchi chaqiruv"</string> diff --git a/java/com/android/incallui/res/values/dimens.xml b/java/com/android/incallui/res/values/dimens.xml index fb4934d01..18816f645 100644 --- a/java/com/android/incallui/res/values/dimens.xml +++ b/java/com/android/incallui/res/values/dimens.xml @@ -38,7 +38,7 @@ <dimen name="incall_dialpad_zero_key_number_margin_bottom">0dp</dimen> <dimen name="incall_dialpad_digits_adjustable_text_size">20sp</dimen> <dimen name="incall_dialpad_digits_adjustable_height">50dp</dimen> - <dimen name="incall_dialpad_key_numbers_size">36dp</dimen> + <dimen name="incall_dialpad_key_numbers_size">36sp</dimen> <!-- Dimensions for OTA Call Card --> <dimen name="otaactivate_layout_marginTop">10dp</dimen> diff --git a/java/com/android/incallui/res/values/styles.xml b/java/com/android/incallui/res/values/styles.xml index 3c036c95f..68a38f0b2 100644 --- a/java/com/android/incallui/res/values/styles.xml +++ b/java/com/android/incallui/res/values/styles.xml @@ -78,13 +78,4 @@ <item name="android:colorAccent">@color/dialer_theme_color</item> </style> - <style name="Theme.Incall.DialogHolder" parent="Theme.AppCompat.Translucent"> - <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:windowActivityTransitions">false</item> - - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:navigationBarColor">@android:color/transparent</item> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - </style> - </resources> |