diff options
author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:05:27 +0000 |
---|---|---|
committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:05:27 +0000 |
commit | 5b4ddcdc8a9aae2aea464c719cd88e66ff9e8ed3 (patch) | |
tree | e0ce071cb8a631fcc56b1bfe103e12a17412f9b1 | |
parent | 5c6054dc4e2a390c4ddcd050e3374d28fed1db3f (diff) | |
parent | ee817344492d7ca692e2130e9cff1aedc1bd2ebb (diff) | |
download | android_frameworks_opt_timezonepicker-5b4ddcdc8a9aae2aea464c719cd88e66ff9e8ed3.tar.gz android_frameworks_opt_timezonepicker-5b4ddcdc8a9aae2aea464c719cd88e66ff9e8ed3.tar.bz2 android_frameworks_opt_timezonepicker-5b4ddcdc8a9aae2aea464c719cd88e66ff9e8ed3.zip |
Merge tag 'android-4.4_r1' into cm-11.0
Android 4.4 Release 1.0
-rw-r--r-- | res/layout/time_zone_filter_item.xml | 2 | ||||
-rw-r--r-- | res/layout/time_zone_item.xml | 2 | ||||
-rw-r--r-- | res/values-en-rIN/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-en-rIN/strings.xml | 24 | ||||
-rw-r--r-- | res/values-et-rEE/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-et-rEE/strings.xml | 24 | ||||
-rw-r--r-- | res/values-hy-rAM/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-hy-rAM/strings.xml | 24 | ||||
-rw-r--r-- | res/values-ka-rGE/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-ka-rGE/strings.xml | 24 | ||||
-rw-r--r-- | res/values-km-rKH/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-km-rKH/strings.xml | 24 | ||||
-rw-r--r-- | res/values-lo-rLA/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-lo-rLA/strings.xml | 24 | ||||
-rw-r--r-- | res/values-mn-rMN/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-mn-rMN/strings.xml | 24 | ||||
-rw-r--r-- | res/values-ms-rMY/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-ms-rMY/strings.xml | 24 | ||||
-rw-r--r-- | res/values-zh-rHK/arrays.xml | 51 | ||||
-rw-r--r-- | res/values-zh-rHK/strings.xml | 24 | ||||
-rw-r--r-- | src/com/android/timezonepicker/TimeZoneResultAdapter.java | 6 |
21 files changed, 681 insertions, 4 deletions
diff --git a/res/layout/time_zone_filter_item.xml b/res/layout/time_zone_filter_item.xml index 0bda8fa..3d38a83 100644 --- a/res/layout/time_zone_filter_item.xml +++ b/res/layout/time_zone_filter_item.xml @@ -31,7 +31,7 @@ android:ellipsize="marquee" android:gravity="center_vertical" android:minHeight="32dp" - android:singleLine="true" + android:maxLines="2" android:textAppearance="?android:attr/textAppearanceMedium" /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/time_zone_item.xml b/res/layout/time_zone_item.xml index fe27fc3..e4b92bf 100644 --- a/res/layout/time_zone_item.xml +++ b/res/layout/time_zone_item.xml @@ -32,7 +32,7 @@ android:layout_height="wrap_content" android:ellipsize="marquee" android:paddingTop="8dp" - android:singleLine="true" + android:maxLines="2" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml new file mode 100644 index 0000000..d6374d4 --- /dev/null +++ b/res/values-en-rIN/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"Australian Central - NT"</item> + <item msgid="4345275500159159867">"Australian Central - SA"</item> + <item msgid="6771274300523132094">"Australian Eastern - QLD"</item> + <item msgid="4685547681424666687">"Australian Eastern - NSW"</item> + <item msgid="5259393186526893961">"Mountain Standard - Dawson Creek"</item> + <item msgid="5984634754870859705">"Central Standard - Saskatchewan"</item> + <item msgid="5340374311583423836">"Eastern Standard - Atikokan"</item> + <item msgid="8922086438245451625">"Atlantic Standard - Quebec"</item> + <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item> + <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item> + <item msgid="7076353182411415610">"Pacific Standard - Metlakatla"</item> + <item msgid="373990592918179890">"Mountain Standard - Arizona"</item> + <item msgid="353899326999279114">"Pacific - Baja California"</item> + <item msgid="6432134534714673873">"Mountain - Chihuahua"</item> + <item msgid="7629345735485663968">"Central - Tamaulipas"</item> + <item msgid="3874729044260979505">"Mountain - Sonora"</item> + <item msgid="1106209575683600471">"East Africa Time"</item> + <item msgid="6538017087072480128">"Atlantic Standard Time"</item> + <item msgid="6758957851822881177">"Atlantic Standard Time"</item> + <item msgid="2477556470536619081">"Eastern European Time"</item> + <item msgid="7328461310893621937">"Kaliningrad Time"</item> + <item msgid="4212642599758736931">"Amazon - Rondônia"</item> + <item msgid="2370319280810537375">"Brasilia - Pará"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"Sint Maarten"</item> + <item msgid="5330962017221568054">"Caribbean Netherlands"</item> + <item msgid="1465164631761814300">"Curaçao"</item> + <item msgid="8972081011408691260">"South Sudan"</item> + </string-array> +</resources> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml new file mode 100644 index 0000000..f126cd0 --- /dev/null +++ b/res/values-en-rIN/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"Type country name"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"Clear query"</string> + <string name="no_results_found" msgid="5475293015394772651">"No results found"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"Palestine"</string> +</resources> diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml new file mode 100644 index 0000000..d997055 --- /dev/null +++ b/res/values-et-rEE/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"Kesk-Austraalia – NT"</item> + <item msgid="4345275500159159867">"Kesk-Austraalia – SA"</item> + <item msgid="6771274300523132094">"Ida-Austraalia aeg – Queensland"</item> + <item msgid="4685547681424666687">"Ida-Austraalia aeg – New South Wales"</item> + <item msgid="5259393186526893961">"Mäestikuvööndi standardaeg – Dawson Creek"</item> + <item msgid="5984634754870859705">"Kesk-Ameerika standardaeg – Saskatchewan"</item> + <item msgid="5340374311583423836">"Idaranniku standardaeg – Atikokan"</item> + <item msgid="8922086438245451625">"Atlandi ookeani standardaeg – Québec"</item> + <item msgid="8353677384517034413">"Hawaii ja Aleuudi saared – Hawaii"</item> + <item msgid="6426791761018806420">"Hawaii ja Aleuudi saared – Alaska"</item> + <item msgid="7076353182411415610">"Vaikse ookeani standardaeg – Metlakatla"</item> + <item msgid="373990592918179890">"Mäestikuvööndi standardaeg – Arizona"</item> + <item msgid="353899326999279114">"Vaikse ookeani aeg – Baja, California"</item> + <item msgid="6432134534714673873">"Mäestikuvööndi aeg – Chihuahua"</item> + <item msgid="7629345735485663968">"Kesk-Ameerika aeg – Tamaulipas"</item> + <item msgid="3874729044260979505">"Mäestikuvööndi aeg – Sonora"</item> + <item msgid="1106209575683600471">"Ida-Aafrika aeg"</item> + <item msgid="6538017087072480128">"Atlandi ookeani standardaeg"</item> + <item msgid="6758957851822881177">"Atlandi ookeani standardaeg"</item> + <item msgid="2477556470536619081">"Ida-Euroopa aeg"</item> + <item msgid="7328461310893621937">"Kaliningradi aeg"</item> + <item msgid="4212642599758736931">"Amazon – Rondônia"</item> + <item msgid="2370319280810537375">"Brasiilia – Pará"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"Saint-Martin"</item> + <item msgid="5330962017221568054">"Hollandi Kariibi mere saared"</item> + <item msgid="1465164631761814300">"Curaçao"</item> + <item msgid="8972081011408691260">"Lõuna-Sudaan"</item> + </string-array> +</resources> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml new file mode 100644 index 0000000..33ccbae --- /dev/null +++ b/res/values-et-rEE/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"Sisestage riigi nimi"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"Päringu tühistamine"</string> + <string name="no_results_found" msgid="5475293015394772651">"Tulemusi ei leitud"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"Palestiina"</string> +</resources> diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml new file mode 100644 index 0000000..7f0f046 --- /dev/null +++ b/res/values-hy-rAM/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"Կենտրոնական Ավստրալիա - NT"</item> + <item msgid="4345275500159159867">"Կենտրոնական Ավստրալիա - SA"</item> + <item msgid="6771274300523132094">"Արևելյան Ավստրալիա - QLD"</item> + <item msgid="4685547681424666687">"Արևելյան Ավստրալիա - NSW"</item> + <item msgid="5259393186526893961">"Լեռնային ստանդարտ - Դոուսոն-Կրիկ"</item> + <item msgid="5984634754870859705">"Կենտրոնական ստանդարտ - Սասկաչևան"</item> + <item msgid="5340374311583423836">"Արևելյան ստանդարտ - Ատիկոկան"</item> + <item msgid="8922086438245451625">"Ատլանտյան ստանդարտ - Քվեբեք"</item> + <item msgid="8353677384517034413">"Հավայի - Ալեության - Հավայի"</item> + <item msgid="6426791761018806420">"Հավայի - Ալեության - Ալյասկա"</item> + <item msgid="7076353182411415610">"Խաղաղօվկիանոսյան Ստանդ. - Մետլակատլա"</item> + <item msgid="373990592918179890">"Լեռնային ստանդ. - Արիզոնա"</item> + <item msgid="353899326999279114">"Խաղաղօվկիանոսյան - Բաջա Կալիֆորնիա"</item> + <item msgid="6432134534714673873">"Լեռնային - Չիհուահուա"</item> + <item msgid="7629345735485663968">"Կենտրոնական - Տամաուլիպաս"</item> + <item msgid="3874729044260979505">"Լեռնային - Սոնորա"</item> + <item msgid="1106209575683600471">"Արևելյան Աֆրիկայի ժամանակ"</item> + <item msgid="6538017087072480128">"Ատլանտյան ստանդարտ ժամանակ"</item> + <item msgid="6758957851822881177">"Ատլանտյան ստանդարտ ժամանակ"</item> + <item msgid="2477556470536619081">"Արևելաևրոպական ժամանակ"</item> + <item msgid="7328461310893621937">"Կալինինգրադի ժամանակ"</item> + <item msgid="4212642599758736931">"Ամազոն - Ռոնդոնիա"</item> + <item msgid="2370319280810537375">"Բրազիլիա - Պարա"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"Սեն Մարտեն"</item> + <item msgid="5330962017221568054">"Կարիբյան Նիդերլանդներ"</item> + <item msgid="1465164631761814300">"Կյուրասաո"</item> + <item msgid="8972081011408691260">"Հարավային Սուդան"</item> + </string-array> +</resources> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml new file mode 100644 index 0000000..6a23cdb --- /dev/null +++ b/res/values-hy-rAM/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"Մուտքագրեք երկրի անվանումը"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"Մաքրել հարցումը"</string> + <string name="no_results_found" msgid="5475293015394772651">"Ոչ մի արդյունք չի գտնվել"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"Պաղեստին"</string> +</resources> diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml new file mode 100644 index 0000000..38e5f45 --- /dev/null +++ b/res/values-ka-rGE/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"Australian Central - NT"</item> + <item msgid="4345275500159159867">"Australian Central - SA"</item> + <item msgid="6771274300523132094">"Australian Eastern - QLD"</item> + <item msgid="4685547681424666687">"Australian Eastern - NSW"</item> + <item msgid="5259393186526893961">"Mountain Standard - დოუსონ ქრიქი"</item> + <item msgid="5984634754870859705">"Central Standard - სასკაჩევანი"</item> + <item msgid="5340374311583423836">"Eastern Standard - ატიკოკანი"</item> + <item msgid="8922086438245451625">"Atlantic Standard - კვებეკი"</item> + <item msgid="8353677384517034413">"ჰავაი-ალეუტიური - ჰავაი"</item> + <item msgid="6426791761018806420">"ჰავაი-ალეუტიური - ალასკა"</item> + <item msgid="7076353182411415610">"Pacific Standard - მეტლაკატია"</item> + <item msgid="373990592918179890">"Mountain Standard - არიზონა"</item> + <item msgid="353899326999279114">"Pacific - ბაჰა კალიფორნია"</item> + <item msgid="6432134534714673873">"Mountain - ჩიჰუაჰუა"</item> + <item msgid="7629345735485663968">"Central - ტამოლიპასი"</item> + <item msgid="3874729044260979505">"Mountain - სანორა"</item> + <item msgid="1106209575683600471">"აღმოსავლეთ აფრიკის დრო"</item> + <item msgid="6538017087072480128">"ატლანტიკური სტანდარტული დრო"</item> + <item msgid="6758957851822881177">"ატლანტიკური სტანდარტული დრო"</item> + <item msgid="2477556470536619081">"აღმოსავლეთ ევროპის დრო"</item> + <item msgid="7328461310893621937">"კალინინგრადის დრო"</item> + <item msgid="4212642599758736931">"ამაზონი - რონდონია"</item> + <item msgid="2370319280810537375">"ბრაზილია - პარა"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"სენ-მარტინი"</item> + <item msgid="5330962017221568054">"კარიბიული ნიდერლანდი"</item> + <item msgid="1465164631761814300">"კურაჩაო"</item> + <item msgid="8972081011408691260">"სამხრეთ სუდანი"</item> + </string-array> +</resources> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml new file mode 100644 index 0000000..5aca8de --- /dev/null +++ b/res/values-ka-rGE/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"შეიყვანეთ ქვეყნის სახელი"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"მოთხოვნის გასუფთავება"</string> + <string name="no_results_found" msgid="5475293015394772651">"შედეგები ვერ მოიძებნა"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"პალესტინა"</string> +</resources> diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml new file mode 100644 index 0000000..d6374d4 --- /dev/null +++ b/res/values-km-rKH/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"Australian Central - NT"</item> + <item msgid="4345275500159159867">"Australian Central - SA"</item> + <item msgid="6771274300523132094">"Australian Eastern - QLD"</item> + <item msgid="4685547681424666687">"Australian Eastern - NSW"</item> + <item msgid="5259393186526893961">"Mountain Standard - Dawson Creek"</item> + <item msgid="5984634754870859705">"Central Standard - Saskatchewan"</item> + <item msgid="5340374311583423836">"Eastern Standard - Atikokan"</item> + <item msgid="8922086438245451625">"Atlantic Standard - Quebec"</item> + <item msgid="8353677384517034413">"Hawaii-Aleutian - Hawaii"</item> + <item msgid="6426791761018806420">"Hawaii-Aleutian - Alaska"</item> + <item msgid="7076353182411415610">"Pacific Standard - Metlakatla"</item> + <item msgid="373990592918179890">"Mountain Standard - Arizona"</item> + <item msgid="353899326999279114">"Pacific - Baja California"</item> + <item msgid="6432134534714673873">"Mountain - Chihuahua"</item> + <item msgid="7629345735485663968">"Central - Tamaulipas"</item> + <item msgid="3874729044260979505">"Mountain - Sonora"</item> + <item msgid="1106209575683600471">"East Africa Time"</item> + <item msgid="6538017087072480128">"Atlantic Standard Time"</item> + <item msgid="6758957851822881177">"Atlantic Standard Time"</item> + <item msgid="2477556470536619081">"Eastern European Time"</item> + <item msgid="7328461310893621937">"Kaliningrad Time"</item> + <item msgid="4212642599758736931">"Amazon - Rondônia"</item> + <item msgid="2370319280810537375">"Brasilia - Pará"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"Sint Maarten"</item> + <item msgid="5330962017221568054">"Caribbean Netherlands"</item> + <item msgid="1465164631761814300">"Curaçao"</item> + <item msgid="8972081011408691260">"South Sudan"</item> + </string-array> +</resources> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml new file mode 100644 index 0000000..4e959d5 --- /dev/null +++ b/res/values-km-rKH/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"បញ្ចូលឈ្មោះប្រទេស"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"សម្អាតសំណួរ"</string> + <string name="no_results_found" msgid="5475293015394772651">"រកមិនឃើញ"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"Palestine"</string> +</resources> diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml new file mode 100644 index 0000000..7598cec --- /dev/null +++ b/res/values-lo-rLA/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"ອົດສະຕຣາລີກາງ - ເຂດເໜືອ"</item> + <item msgid="4345275500159159867">"ອົດສະຕຣາລີກາງ - ເຂດໃຕ້"</item> + <item msgid="6771274300523132094">"ອົດສະຕຣາລີຕາເວັນອອກ - QLD"</item> + <item msgid="4685547681424666687">"ອົດສະຕຣາລີຕາເວັນອອກ - ນິວຊາວເວວ"</item> + <item msgid="5259393186526893961">"ເວລາພູເຂົາມາດຕະຖານ - ດໍສັນ ຄຣີກ"</item> + <item msgid="5984634754870859705">"ມາດຕະຖານສູນກາງ - ແຄັດເຊວັນ"</item> + <item msgid="5340374311583423836">"ມາດຕະຖານຕາເວັນອອກ - ອາທິໂກແກນ"</item> + <item msgid="8922086438245451625">"ມາດຕະຖານແອັດແລນຕິກ - ກຸຍເບັກ"</item> + <item msgid="8353677384517034413">"ຮາວາຍ-ເອລູທຽນ - ຮາວາຍ"</item> + <item msgid="6426791761018806420">"ຮາວາຍ-ເອລູທຽນ - ອະລັສກາ"</item> + <item msgid="7076353182411415610">"ມາດຕະຖານປາຊີຟິກ - ເມັດລາແຄັດລາ"</item> + <item msgid="373990592918179890">"ມາດຕະຖານເວລາພູເຂົາ - ອາຣິໂຊນາ"</item> + <item msgid="353899326999279114">"ປາຊີຟິກ - ປາຮາ ຄາລິຟໍເນຍ"</item> + <item msgid="6432134534714673873">"ເວລາພູເຂົາ - ຊິຮົວຮົວ"</item> + <item msgid="7629345735485663968">"ໃຈກາງ - ທາເມົາລິປາສ"</item> + <item msgid="3874729044260979505">"ເວລາພູເຂົາ - ໂຊໂນຣາ"</item> + <item msgid="1106209575683600471">"ເວລາອາຟຣິກກາຕາເວັນອອກ"</item> + <item msgid="6538017087072480128">"ເວລາແອັດແລນຕິກມາດຕະຖານ"</item> + <item msgid="6758957851822881177">"ເວລາແອັດແລນຕິກມາດຕະຖານ"</item> + <item msgid="2477556470536619081">"ເວລາເອີຣົບຕາເວັນອອກ"</item> + <item msgid="7328461310893621937">"ເວລາຄາລິນິນກຣາດ"</item> + <item msgid="4212642599758736931">"ອາເມຊອນ - ຣອນໂດເນຍ"</item> + <item msgid="2370319280810537375">"ບຣາຊິວເລຍ - ເພຣາ"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"ຊິນ ມາເທ"</item> + <item msgid="5330962017221568054">"ຄາຣິບຽນ ເນເທີແລນ"</item> + <item msgid="1465164631761814300">"ຄູຣາເຊົາ"</item> + <item msgid="8972081011408691260">"ຊູດານໃຕ້"</item> + </string-array> +</resources> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml new file mode 100644 index 0000000..bb2f773 --- /dev/null +++ b/res/values-lo-rLA/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"ພິມຊື່ປະເທດ"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"ລຶບຂໍ້ຄວາມຊອກຫາ"</string> + <string name="no_results_found" msgid="5475293015394772651">"ບໍ່ພົບຜົນການຊອກຫາ"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"ປາເລສຕາຍ"</string> +</resources> diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml new file mode 100644 index 0000000..af957c1 --- /dev/null +++ b/res/values-mn-rMN/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"Австралийн төвийн - NT"</item> + <item msgid="4345275500159159867">"Австралын төвийн - SA"</item> + <item msgid="6771274300523132094">"Австралийн зүүн - QLD"</item> + <item msgid="4685547681424666687">"Австралийн зүүн - NSW"</item> + <item msgid="5259393186526893961">"Уулын стандарт - Давсон Крийк"</item> + <item msgid="5984634754870859705">"Төвийн стандарт - Саскачеван"</item> + <item msgid="5340374311583423836">"Зүүн стандарт - Атикокан"</item> + <item msgid="8922086438245451625">"Атлантик стандарт - Квебек"</item> + <item msgid="8353677384517034413">"Хавай-Алеутиан - Хавай"</item> + <item msgid="6426791761018806420">"Хавай-Алеутиан - Аляск"</item> + <item msgid="7076353182411415610">"Номхон далайн стандарт - Метлакатла"</item> + <item msgid="373990592918179890">"Уулын стандарт - Аризона"</item> + <item msgid="353899326999279114">"Номхон далайн - Баха Калифорниа"</item> + <item msgid="6432134534714673873">"Уулын - Чивава"</item> + <item msgid="7629345735485663968">"Төвийн - Тамаулипас"</item> + <item msgid="3874729044260979505">"Уулын - Сонора"</item> + <item msgid="1106209575683600471">"Зүүн Африкын цаг"</item> + <item msgid="6538017087072480128">"Атлантын стандарт цаг"</item> + <item msgid="6758957851822881177">"Атлантын стандарт цаг"</item> + <item msgid="2477556470536619081">"Зүүн Европын цаг"</item> + <item msgid="7328461310893621937">"Калининградын цаг"</item> + <item msgid="4212642599758736931">"Амазон - Рондониа"</item> + <item msgid="2370319280810537375">"Бразилиа - Пара"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"Сент-Мартин"</item> + <item msgid="5330962017221568054">"Карибын Нидерланд"</item> + <item msgid="1465164631761814300">"Кюрасао"</item> + <item msgid="8972081011408691260">"Өмнөд Судан"</item> + </string-array> +</resources> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml new file mode 100644 index 0000000..5b31356 --- /dev/null +++ b/res/values-mn-rMN/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"Улсын нэрийг оруулна уу"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"Асуулгыг цэвэрлэх"</string> + <string name="no_results_found" msgid="5475293015394772651">"Илэрцгүй"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"Палестин"</string> +</resources> diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml new file mode 100644 index 0000000..a27f9f1 --- /dev/null +++ b/res/values-ms-rMY/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"Australia Tengah - NT"</item> + <item msgid="4345275500159159867">"Australia Tengah - SA"</item> + <item msgid="6771274300523132094">"Australia Timur - QLD"</item> + <item msgid="4685547681424666687">"Australia Timur - NSW"</item> + <item msgid="5259393186526893961">"Piawai Pergunungan - Dawson Creek"</item> + <item msgid="5984634754870859705">"Piawai Tengah - Saskatchewan"</item> + <item msgid="5340374311583423836">"Piawai Timur - Atikokan"</item> + <item msgid="8922086438245451625">"Piawai Atlantik - Quebec"</item> + <item msgid="8353677384517034413">"Aleutian Hawaii - Hawaii"</item> + <item msgid="6426791761018806420">"Aleutian Hawaii - Alaska"</item> + <item msgid="7076353182411415610">"Piawai Pasifik - Metlakatla"</item> + <item msgid="373990592918179890">"Piawai Pergunungan - Arizona"</item> + <item msgid="353899326999279114">"Pasifik - Baja California"</item> + <item msgid="6432134534714673873">"Pergunungan - Chihuahua"</item> + <item msgid="7629345735485663968">"Tengah - Tamaulipas"</item> + <item msgid="3874729044260979505">"Pergunungan - Sonora"</item> + <item msgid="1106209575683600471">"Waktu Afrika Timur"</item> + <item msgid="6538017087072480128">"Waktu Piawai Atlantik"</item> + <item msgid="6758957851822881177">"Waktu Piawai Atlantik"</item> + <item msgid="2477556470536619081">"Waktu Eropah Timur"</item> + <item msgid="7328461310893621937">"Waktu Kaliningrad"</item> + <item msgid="4212642599758736931">"Amazon - Rondônia"</item> + <item msgid="2370319280810537375">"Brasilia - Pará"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"Sint Maarten"</item> + <item msgid="5330962017221568054">"Caribbean Belanda"</item> + <item msgid="1465164631761814300">"Curaçao"</item> + <item msgid="8972081011408691260">"Sudan Selatan"</item> + </string-array> +</resources> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml new file mode 100644 index 0000000..4d76d09 --- /dev/null +++ b/res/values-ms-rMY/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"Taip nama negara"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"Kosongkan pertanyaan"</string> + <string name="no_results_found" msgid="5475293015394772651">"Tiada hasil ditemui"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"Palestin"</string> +</resources> diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml new file mode 100644 index 0000000..1b5c328 --- /dev/null +++ b/res/values-zh-rHK/arrays.xml @@ -0,0 +1,51 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="timezone_rename_labels"> + <item msgid="4609638052107641231">"澳洲中部時間 - 北領地"</item> + <item msgid="4345275500159159867">"澳洲中部時間 - 南澳"</item> + <item msgid="6771274300523132094">"澳洲東部時間 - 昆士蘭"</item> + <item msgid="4685547681424666687">"澳洲東部時間 - 新南威爾斯"</item> + <item msgid="5259393186526893961">"山區標準時間 - 道森克里克"</item> + <item msgid="5984634754870859705">"中部標準時間 - 薩斯喀徹溫"</item> + <item msgid="5340374311583423836">"東部標準時間 - 阿蒂科肯"</item> + <item msgid="8922086438245451625">"大西洋標準時間 - 魁北克"</item> + <item msgid="8353677384517034413">"夏威夷/阿留申時間 - 夏威夷"</item> + <item msgid="6426791761018806420">"夏威夷/阿留申時間 - 阿拉斯加"</item> + <item msgid="7076353182411415610">"太平洋標準時間 - 梅特拉卡特拉"</item> + <item msgid="373990592918179890">"山區標準時間 - 亞利桑那"</item> + <item msgid="353899326999279114">"太平洋時間 - 下加利福尼亞"</item> + <item msgid="6432134534714673873">"山區時間 - 吉娃娃"</item> + <item msgid="7629345735485663968">"中部時間 - 塔毛利帕斯"</item> + <item msgid="3874729044260979505">"山區時間 - 索諾拉"</item> + <item msgid="1106209575683600471">"東非時間"</item> + <item msgid="6538017087072480128">"大西洋標準時間"</item> + <item msgid="6758957851822881177">"大西洋標準時間"</item> + <item msgid="2477556470536619081">"東歐時間"</item> + <item msgid="7328461310893621937">"加里寧格勒時間"</item> + <item msgid="4212642599758736931">"亞馬遜 - 朗多尼亞"</item> + <item msgid="2370319280810537375">"巴西利亞 - 帕拉"</item> + </string-array> + <string-array name="backup_country_names"> + <item msgid="9141777876082196578">"聖馬丁"</item> + <item msgid="5330962017221568054">"荷蘭加勒比區"</item> + <item msgid="1465164631761814300">"庫拉索"</item> + <item msgid="8972081011408691260">"南蘇丹"</item> + </string-array> +</resources> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml new file mode 100644 index 0000000..2eb8c20 --- /dev/null +++ b/res/values-zh-rHK/strings.xml @@ -0,0 +1,24 @@ +<?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 xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="hint_time_zone_search" msgid="804776560897143016">"請輸入國家/地區名稱"</string> + <string name="searchview_description_clear" msgid="1603860069305867810">"清除查詢"</string> + <string name="no_results_found" msgid="5475293015394772651">"找不到結果"</string> + <string name="palestine_display_name" msgid="3485026339977302148">"巴勒斯坦"</string> +</resources> diff --git a/src/com/android/timezonepicker/TimeZoneResultAdapter.java b/src/com/android/timezonepicker/TimeZoneResultAdapter.java index 4708ad9..38f2b50 100644 --- a/src/com/android/timezonepicker/TimeZoneResultAdapter.java +++ b/src/com/android/timezonepicker/TimeZoneResultAdapter.java @@ -308,8 +308,10 @@ public class TimeZoneResultAdapter extends BaseAdapter implements OnItemClickLis public void onItemClick(AdapterView<?> parent, View v, int position, long id) { if (mTimeZoneSetListener != null) { TimeZoneInfo tzi = (TimeZoneInfo) v.getTag(VIEW_TAG_TIME_ZONE); - mTimeZoneSetListener.onTimeZoneSet(tzi); - saveRecentTimezone(tzi.mTzId); + if (tzi != null) { + mTimeZoneSetListener.onTimeZoneSet(tzi); + saveRecentTimezone(tzi.mTzId); + } } } } |