Skip to content
This repository has been archived by the owner on Nov 15, 2022. It is now read-only.

Commit

Permalink
Revert "Update Messaging app with msim changes from klp-sprout"
Browse files Browse the repository at this point in the history
Bug 18373926

Revert the msim-aware Messaging app back to the original Messaging app.

Change-Id: I1b47b78d3d86580b8f1cd1d73ddbb94a417e845b
  • Loading branch information
Tom Taylor committed Nov 13, 2014
1 parent 0f5099d commit a277f43
Show file tree
Hide file tree
Showing 227 changed files with 1,456 additions and 7,958 deletions.
7 changes: 0 additions & 7 deletions AndroidManifest.xml
Expand Up @@ -191,10 +191,6 @@
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="@string/preferences_title" />

<activity android:name=".ui.SubSelectActivity"
android:theme="@style/MmsHoloTheme"
android:configChanges="orientation|screenSize|keyboardHidden"/>

<receiver android:name=".transaction.PushReceiver"
android:permission="android.permission.BROADCAST_WAP_PUSH">
<intent-filter>
Expand Down Expand Up @@ -266,9 +262,6 @@
<intent-filter>
<action android:name="android.provider.Telephony.SIM_FULL" />
</intent-filter>
<intent-filter>
<action android:name="com.android.mms.ui.SIM_FULL_VIEWED" />
</intent-filter>
</receiver>

<receiver android:name=".transaction.SmsRejectedReceiver">
Expand Down
3 changes: 3 additions & 0 deletions CleanSpec.mk
Expand Up @@ -44,6 +44,9 @@
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Mms*)
$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/APPS/Mms*)

# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
4 changes: 4 additions & 0 deletions proguard.flags
@@ -1,3 +1,7 @@
-keep class com.android.mms.ui.MmsThumbnailPresenter {
*;
}

-keep class com.android.mms.ui.SlideshowPresenter {
*;
}
Binary file removed res/drawable-hdpi/sim_background_locked.9.png
Binary file not shown.
Binary file removed res/drawable-mdpi/sim_background_locked.9.png
Binary file not shown.
Binary file removed res/drawable-xhdpi/sim_background_locked.9.png
Binary file not shown.
Binary file removed res/drawable-xxhdpi/sim_background_locked.9.png
Binary file not shown.
3 changes: 2 additions & 1 deletion res/layout/conversation_list_screen.xml
Expand Up @@ -20,7 +20,8 @@

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent"
android:focusable="true" >

<ListView android:id="@android:id/list"
style="?android:attr/listViewWhiteStyle"
Expand Down
21 changes: 0 additions & 21 deletions res/layout/message_list_item_recv.xml
Expand Up @@ -65,34 +65,13 @@
android:textColor="#ff000000"
android:textSize="16sp" />

<TextView android:id="@+id/expires_view"
android:background="@drawable/listitem_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/message_item_text_padding_left_right"
android:paddingRight="3dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/text_hairline"
android:visibility="gone" />

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dip"
android:paddingLeft="@dimen/message_item_text_padding_left_right"
android:baselineAligned="true"
android:orientation="horizontal" >

<TextView android:id="@+id/sim_status"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:linksClickable="false"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#ffffffff"
android:textSize="9dip"
android:layout_marginRight="6dip"
android:layout_gravity="bottom" />

<TextView android:id="@+id/date_view"
android:background="@drawable/listitem_background"
android:layout_width="wrap_content"
Expand Down
11 changes: 0 additions & 11 deletions res/layout/message_list_item_send.xml 100755 → 100644
Expand Up @@ -72,7 +72,6 @@
android:layout_marginBottom="8dip"
android:paddingRight="@dimen/message_item_text_padding_left_right"
android:gravity="right"
android:baselineAligned="true"
android:orientation="horizontal" >

<ImageView
Expand All @@ -99,16 +98,6 @@
android:src="@drawable/ic_sms_mms_details"
android:visibility="gone" />

<TextView android:id="@+id/sim_status"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:linksClickable="false"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#ffffffff"
android:textSize="9dip"
android:layout_marginRight="6dip"
android:layout_gravity="bottom" />

<TextView android:id="@+id/date_view"
android:background="@drawable/listitem_background"
android:layout_width="wrap_content"
Expand Down
44 changes: 0 additions & 44 deletions res/layout/sub_select_item.xml

This file was deleted.

69 changes: 0 additions & 69 deletions res/layout/subscription_item_layout.xml

This file was deleted.

9 changes: 0 additions & 9 deletions res/values-af/strings.xml
Expand Up @@ -182,8 +182,6 @@
<string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Klank"</string>
<string name="pref_messages_to_save" msgid="3202539743892934926">"Stel aantal boodskappe om te stoor"</string>
<string name="silent_ringtone" msgid="7981237991326592780">"Stil"</string>
<string name="pref_summary_sim_ask" msgid="5815190975933015621">"Vra watter SIM om te gebruik elke keer wanneer \'n boodskap gestuur word"</string>
<string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
<string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Herwin outomaties"</string>
<string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Gaan haal boodskappe outomaties"</string>
<string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Outoherwinning wanneer swerf"</string>
Expand Down Expand Up @@ -357,11 +355,4 @@
<string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Boodskappe is nie jou SMS-program nie"</string>
<string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> is jou SMS-program"</string>
<string name="banner_sms_promo_message" msgid="3536714414252763826">"Jy kan dit verander in Instellings"</string>
<string name="sub_select_dialog_title" msgid="8210168935409702285">"Kies SIM"</string>
<string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
<string name="empty_sim_name" msgid="1008631117599170591">"SIM-gleuf <xliff:g id="SUBID">%1$d</xliff:g>"</string>
<string name="subSelect_negative" msgid="6139403806707801822">"Kanselleer"</string>
<string name="sub_name_container" msgid="4802195955108231738">" <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
<string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
<string name="selected_sim_invalid" msgid="2309319911434202998">"Tans gekose SIM is nie teenwoordig nie. Kies jou verstek-SIM in stelselinstellings."</string>
</resources>
9 changes: 0 additions & 9 deletions res/values-am/strings.xml
Expand Up @@ -182,8 +182,6 @@
<string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ድምፅ"</string>
<string name="pref_messages_to_save" msgid="3202539743892934926">"ለማስቀመጥ የመልዕክቶች ቁጥር አዘጋጅ"</string>
<string name="silent_ringtone" msgid="7981237991326592780">"ፀጥታ"</string>
<string name="pref_summary_sim_ask" msgid="5815190975933015621">"መልዕክት በሚላክበት ጊዜ ሁሉ የትኛው ሲም ጥቅም ላይ እንደሚውል ጠይቅ"</string>
<string name="pref_title_sim_ask" msgid="4794530561349736162">"ባለ ብዙ-ሲም"</string>
<string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"በራስ- ሰርስረህ አውጣ"</string>
<string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"በራስ ሰር መልዕክቶች ሰርስረህ አውጣ"</string>
<string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"በእንቅስቃሴ ላይ በራስ- ሰርስረህ አውጣ"</string>
Expand Down Expand Up @@ -357,11 +355,4 @@
<string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging የእርስዎ ኤስ ኤም ኤስ መተግበሪያ አይደለም"</string>
<string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> የእርስዎ ኤስ ኤም ኤስ መተግበሪያ ነው"</string>
<string name="banner_sms_promo_message" msgid="3536714414252763826">"ይህን በቅንብሮች ውስጥ መቀየር ይችላሉ"</string>
<string name="sub_select_dialog_title" msgid="8210168935409702285">"ሲም ይምረጡ"</string>
<string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
<string name="empty_sim_name" msgid="1008631117599170591">"SIM ማስገቢያ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
<string name="subSelect_negative" msgid="6139403806707801822">"ተወው"</string>
<string name="sub_name_container" msgid="4802195955108231738">" <xliff:g id="SUBNAME">%1$s</xliff:g> "</string>
<string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
<string name="selected_sim_invalid" msgid="2309319911434202998">"አሁን የተመረጠው ሲም አይገኝም። በስርዓት ቅንብሮቸ ውስጥ ነባሪ ሲምዎን ይምረጡ።"</string>
</resources>
9 changes: 0 additions & 9 deletions res/values-ar/strings.xml
Expand Up @@ -182,8 +182,6 @@
<string name="pref_title_notification_ringtone" msgid="8667533917574559659">"الصوت"</string>
<string name="pref_messages_to_save" msgid="3202539743892934926">"تعيين عدد الرسائل التي سيتم حفظها"</string>
<string name="silent_ringtone" msgid="7981237991326592780">"صامت"</string>
<string name="pref_summary_sim_ask" msgid="5815190975933015621">"‏السؤال عن بطاقة SIM المراد استخدامها في كل مرة يتم إرسال رسالة"</string>
<string name="pref_title_sim_ask" msgid="4794530561349736162">"‏بطاقات SIM متعددة"</string>
<string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"استرداد تلقائي"</string>
<string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"استرداد الرسائل تلقائيًا"</string>
<string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"استرداد تلقائي للتجوال"</string>
Expand Down Expand Up @@ -357,11 +355,4 @@
<string name="banner_sms_promo_title_initial" msgid="510014388581481569">"‏المراسلة ليس تطبيقك للرسائل القصيرة SMS"</string>
<string name="banner_sms_promo_title_application" msgid="8123569785369713254">"‏<xliff:g id="APPNAME">%s</xliff:g> هو تطبيق الرسائل القصيرة SMS"</string>
<string name="banner_sms_promo_message" msgid="3536714414252763826">"يمكنك تغيير ذلك من الإعدادات"</string>
<string name="sub_select_dialog_title" msgid="8210168935409702285">"‏تحديد SIM"</string>
<string name="default_sim_name" msgid="903290497566800216">"‏SIM‏ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
<string name="empty_sim_name" msgid="1008631117599170591">"‏فتحة SIM‏ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
<string name="subSelect_negative" msgid="6139403806707801822">"إلغاء"</string>
<string name="sub_name_container" msgid="4802195955108231738">" <xliff:g id="SUBNAME">%1$s</xliff:g> "</string>
<string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
<string name="selected_sim_invalid" msgid="2309319911434202998">"‏بطاقة SIM المحددة حاليًا غير موجودة. اختر بطاقة SIM الافتراضية في إعدادات النظام."</string>
</resources>
47 changes: 47 additions & 0 deletions res/values-az-rAZ/arrays.xml
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
* Copyright (C) 2008 Esmertec AG.
* Copyright (C) 2008 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="default_smiley_names">
<item msgid="1831934949361041701">"Xoşbəxt"</item>
<item msgid="1601611480575517120">"Kədərli"</item>
<item msgid="1531181614218625881">"Gözvurma"</item>
<item msgid="3858808057949077894">"Sallanmış dil"</item>
<item msgid="7835238297967185651">"Təəccüb"</item>
<item msgid="1756223535005296033">"Öpüş"</item>
<item msgid="1093906245140165107">"Çığırtı"</item>
<item msgid="888834839864150170">"Xodgedən"</item>
<item msgid="6320683740534773967">"Pulağız"</item>
<item msgid="6610111212478853990">"Ayaq ağızda"</item>
<item msgid="1706035208563940251">"Utanmış"</item>
<item msgid="9079275787422313427">"Mələk"</item>
<item msgid="4630490399784004880">"Qərarsız"</item>
<item msgid="7002574538342357456">"Ağlayan"</item>
<item msgid="850324578089267455">"Möhürlü dodaqlar"</item>
<item msgid="6334637439528489607">"Gülüş"</item>
<item msgid="7602915122893958066">"Çaşqın"</item>
<item msgid="3939233701582771068">"Ürək"</item>
<item msgid="1414759480575851587">"Dəli"</item>
<item msgid="8479809115158836070">"Saxta təbəssüm"</item>
<item msgid="638612939305162424">"İfadəsiz sifət"</item>
</string-array>
<string-array name="empty_subject_strings">
<item msgid="7691141505407124426">"mövzu yoxdur"</item>
</string-array>
</resources>

0 comments on commit a277f43

Please sign in to comment.