aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/emoji_palettes_view.xml2
-rw-r--r--java/res/layout/user_dictionary_add_word.xml90
-rw-r--r--java/res/values-de/strings-emoji-descriptions.xml6
-rw-r--r--java/res/values-pt/strings-emoji-descriptions.xml2
4 files changed, 5 insertions, 95 deletions
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml
index 26cc042ab..7c5f6c0a6 100644
--- a/java/res/layout/emoji_palettes_view.xml
+++ b/java/res/layout/emoji_palettes_view.xml
@@ -71,7 +71,7 @@
android:soundEffectsEnabled="false"
android:contentDescription="@string/spoken_description_delete" />
</LinearLayout>
- <android.support.v4.view.ViewPager
+ <androidx.viewpager.widget.ViewPager
android:id="@+id/emoji_keyboard_pager"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/java/res/layout/user_dictionary_add_word.xml b/java/res/layout/user_dictionary_add_word.xml
deleted file mode 100644
index 615fde589..000000000
--- a/java/res/layout/user_dictionary_add_word.xml
+++ /dev/null
@@ -1,90 +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.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/user_dict_settings_add_dialog_top"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <com.android.internal.widget.DialogTitle
- style="?android:attr/windowTitleStyle"
- android:layout_width="match_parent"
- android:layout_height="64dip"
- android:layout_marginEnd="16dip"
- android:layout_marginStart="16dip"
- android:ellipsize="end"
- android:gravity="center_vertical|start"
- android:singleLine="true"
- android:text="@string/user_dict_settings_add_dialog_title" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="2dip"
- android:background="@android:color/holo_blue_light" />
- </LinearLayout>
-
- <EditText
- android:id="@+id/user_dictionary_add_word_text"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_gravity="fill_horizontal|center_vertical"
- android:layout_marginBottom="8dip"
- android:layout_marginStart="8dip"
- android:layout_marginTop="8dip"
- android:hint="@string/user_dict_settings_add_word_hint"
- android:imeOptions="flagNoFullscreen"
- android:inputType="textNoSuggestions"
- android:maxLength="@integer/config_user_dictionary_max_word_length" >
-
- <requestFocus />
- </EditText>
-
- <LinearLayout
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:measureWithLargestChild="true"
- android:orientation="horizontal" >
-
- <Button
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:layout_weight="1"
- android:maxLines="2"
- android:onClick="onClickCancel"
- android:text="@string/cancel"
- android:textSize="14sp" />
-
- <Button
- style="?android:attr/buttonBarButtonStyle"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_gravity="end"
- android:layout_weight="1"
- android:maxLines="2"
- android:onClick="onClickConfirm"
- android:text="@string/user_dict_settings_add_dialog_confirm"
- android:textSize="14sp" />
- </LinearLayout>
-
-</LinearLayout> \ No newline at end of file
diff --git a/java/res/values-de/strings-emoji-descriptions.xml b/java/res/values-de/strings-emoji-descriptions.xml
index 0e4699b7c..75c8efae7 100644
--- a/java/res/values-de/strings-emoji-descriptions.xml
+++ b/java/res/values-de/strings-emoji-descriptions.xml
@@ -249,7 +249,7 @@
<string name="spoken_emoji_1F194" msgid="4903128609556175887">"Quadrat mit \"ID\""</string>
<string name="spoken_emoji_1F195" msgid="1433142500411060924">"Quadrat mit \"New\""</string>
<string name="spoken_emoji_1F196" msgid="8825160701159634202">"Quadrat mit \"NG\" (No Good)"</string>
- <string name="spoken_emoji_1F197" msgid="7841079241554176535">"Quadrat mit \"OK\""</string>
+ <string name="spoken_emoji_1F197" msgid="7841079241554176535">"Quadrat mit \"Ok\""</string>
<string name="spoken_emoji_1F198" msgid="7020298909426960622">"Quadrat mit \"SOS\""</string>
<string name="spoken_emoji_1F199" msgid="5971252667136235630">"Quadrat mit \"UP\" und Ausrufezeichen"</string>
<string name="spoken_emoji_1F19A" msgid="4557270135899843959">"Quadrat mit \"VS\" (Versus)"</string>
@@ -651,7 +651,7 @@
<string name="spoken_emoji_1F449" msgid="4764447975177805991">"Handrückseite mit nach rechts deutendem Zeigefinger"</string>
<string name="spoken_emoji_1F44A" msgid="7197417095486424841">"Faust"</string>
<string name="spoken_emoji_1F44B" msgid="1975968945250833117">"Winkende Hand"</string>
- <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Handzeichen für \"OK\""</string>
+ <string name="spoken_emoji_1F44C" msgid="3185919567897876562">"Handzeichen für \"Ok\""</string>
<string name="spoken_emoji_1F44D" msgid="6182553970602667815">"Daumen hoch"</string>
<string name="spoken_emoji_1F44E" msgid="8030851867365111809">"Daumen runter"</string>
<string name="spoken_emoji_1F44F" msgid="5148753662268213389">"Klatschende Hände"</string>
@@ -1082,7 +1082,7 @@
<!-- no translation found for spoken_emoji_1F644 (446284817942609022) -->
<skip />
<string name="spoken_emoji_1F645" msgid="5202090629227587076">"Gesicht mit Nicht in Ordnung-Geste"</string>
- <string name="spoken_emoji_1F646" msgid="6734425134415138134">"Gesicht mit OK-Geste"</string>
+ <string name="spoken_emoji_1F646" msgid="6734425134415138134">"Gesicht mit Ok-Geste"</string>
<string name="spoken_emoji_1F647" msgid="1090285518444205483">"Sich tief verneigende Person"</string>
<string name="spoken_emoji_1F648" msgid="8978535230610522356">"Nichts-Sehen-Affe"</string>
<string name="spoken_emoji_1F649" msgid="8486145279809495102">"Nichts-Hören-Affe"</string>
diff --git a/java/res/values-pt/strings-emoji-descriptions.xml b/java/res/values-pt/strings-emoji-descriptions.xml
index e6f51a92a..05d373974 100644
--- a/java/res/values-pt/strings-emoji-descriptions.xml
+++ b/java/res/values-pt/strings-emoji-descriptions.xml
@@ -813,7 +813,7 @@
<string name="spoken_emoji_1F4EB" msgid="6491414165464146137">"Caixa de correio fechada com bandeira levantada"</string>
<string name="spoken_emoji_1F4EC" msgid="7369517138779988438">"Caixa de correio aberta com bandeira levantada"</string>
<string name="spoken_emoji_1F4ED" msgid="5657520436285454241">"Caixa de correio aberta com bandeira abaixada"</string>
- <string name="spoken_emoji_1F4EE" msgid="8464138906243608614">"Caixa de correio"</string>
+ <string name="spoken_emoji_1F4EE" msgid="8464138906243608614">"Caixa de e-mails"</string>
<string name="spoken_emoji_1F4EF" msgid="8801427577198798226">"Corneta de correio"</string>
<string name="spoken_emoji_1F4F0" msgid="6330208624731662525">"Jornal"</string>
<string name="spoken_emoji_1F4F1" msgid="3966503935581675695">"Celular"</string>
generated by cgit v1.2.3-83-g751a (git 2.47.1) at 2025-07-02 13:46:34 +0000