Skip to content

Remove code for SDKs lower than 36 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdsantos wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove code for SDKs lower than 36 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baf5a36
Remove code for SDKs lower than 36
sdsantos Aug 12, 2026
e3b8629
Remove further code for SDKs lower than 36. Address code review comme…
sdsantos Aug 13, 2026
d97e7e6
Support for null intent and cancelled response when creating a shortcut
sdsantos Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ android {
}
}

// Uncomment to add the tests folder to the Gradle build path
// sourceSets.getByName("androidTest") {
// java.directories.add("../tests/src")
// }

lint {
abortOnError = false
disable += setOf("UnusedResources", "UnusedIds")
Expand Down
6 changes: 2 additions & 4 deletions app/src/test/kotlin/com/android/contacts/ui/settings/screen/SettingsEffectHandlerImplTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import android.provider.Settings
import android.telecom.TelecomManager
import androidx.activity.result.ActivityResultLauncher
import com.android.contacts.activities.LicenseActivity
import com.android.contacts.compat.TelecomManagerUtil
import com.android.contacts.interactions.ExportDialogFragment
import com.android.contacts.interactions.ImportDialogFragment
import com.android.contacts.list.AccountFilterActivity
Expand Down Expand Up @@ -54,7 +53,6 @@ internal class SettingsEffectHandlerImplTest {
@Before
fun setUp() {
mockkStatic(ImplicitIntentsUtil::class)
mockkStatic(TelecomManagerUtil::class)
mockkStatic(ImportDialogFragment::class)
mockkStatic(ExportDialogFragment::class)
every { activity.fragmentManager } returns fragmentManager
Expand Down Expand Up @@ -153,7 +151,7 @@ internal class SettingsEffectHandlerImplTest {
@Test
fun openBlockedNumbers_startsTheTelecomScreen() {
val blockedNumbersIntent = Intent("blocked_numbers")
every { TelecomManagerUtil.createManageBlockedNumbersIntent(telecomManager) }
every { telecomManager.createManageBlockedNumbersIntent() }
.returns(blockedNumbersIntent)

effectHandler.handle(Effect.OpenBlockedNumbers)
Expand All @@ -163,7 +161,7 @@ internal class SettingsEffectHandlerImplTest {

@Test
fun openBlockedNumbers_whenTelecomHasNoIntent_startsNothing() {
every { TelecomManagerUtil.createManageBlockedNumbersIntent(telecomManager) }
every { telecomManager.createManageBlockedNumbersIntent() }
.returns(null)

effectHandler.handle(Effect.OpenBlockedNumbers)
Expand Down
3 changes: 0 additions & 3 deletions proguard.flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
}

# Needed for tests
-keep class com.android.contacts.compat.CompatUtils { *; }
-keep class com.android.contacts.Collapser { *; }
-keep class com.android.contacts.ContactPhotoManager { *; }
-keep class com.android.contacts.ContactsApplication { *; }
Expand Down Expand Up @@ -54,10 +53,8 @@
-keep class com.android.contacts.model.account.SimAccountType { *; }
-keep class com.android.contacts.model.AccountTypeManager { *; }
-keep class com.android.contacts.model.AccountTypeManagerImpl { *; }
-keep class com.android.contacts.model.BuilderWrapper { *; }
-keep class com.android.contacts.model.Contact { *; }
-keep class com.android.contacts.model.ContactLoader { *; }
-keep class com.android.contacts.model.CPOWrapper { *; }
-keep class com.android.contacts.model.dataitem.DataItem { *; }
-keep class com.android.contacts.model.dataitem.DataKind { *; }
-keep class com.android.contacts.model.dataitem.EmailDataItem { *; }
Expand Down
5 changes: 0 additions & 5 deletions res/values-af/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@
<string name="deleteConfirmation" msgid="3727809366015979585">"Vee hierdie kontak uit?"</string>
<string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"Vee uit"</string>
<string name="invalidContactMessage" msgid="6204402264821083362">"Die kontak bestaan ​​nie."</string>
<string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"Kontak is by Tuisskerm gevoeg."</string>
<string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> is by Tuisskerm gevoeg."</string>
<string name="photoPickerNotFoundText" msgid="6535222297923110991">"Geen prente is beskikbaar op die toestel nie."</string>
<string name="attach_photo_dialog_title" msgid="7948754072673745235">"Kontakfoto"</string>
<string name="customLabelPickerTitle" msgid="816694850254307154">"Gepasmaakte etiketnaam"</string>
Expand Down Expand Up @@ -251,7 +249,6 @@
<string name="call_work_pager" msgid="615335008331933747">"Bel werkroeper"</string>
<string name="call_assistant" msgid="8556909944379826616">"Bel <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="call_mms" msgid="1760746475672950386">"Bel MMS"</string>
<string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Bel)"</string>
<string name="sms_custom" msgid="3684453744622817362">"SMS <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="sms_home" msgid="6132392861245316613">"Teks - tuis"</string>
<string name="sms_mobile" msgid="433949735070334192">"Teks - selfoon"</string>
Expand All @@ -273,7 +270,6 @@
<string name="sms_work_pager" msgid="8827367747655005608">"Teks - werkroeper"</string>
<string name="sms_assistant" msgid="245045451580096547">"Teks <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="7395133080765833725">"Teks - MMS"</string>
<string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Boodskap)"</string>
<string name="description_video_call" msgid="4956825008907720371">"Maak video-oproep"</string>
<string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"Vee dikwels-gebruikte kontakte uit?"</string>
<string name="clearFrequentsConfirmation" msgid="2120741757522063938">"Jy gaan die lys van dikwels gebruikte kontakte in die Kontakte- en Foon-app uitvee en e-posapps dwing om jou adresvoorkeure van nuuts af te leer."</string>
Expand Down Expand Up @@ -484,7 +480,6 @@
<string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"Veranderinge wat jy aan alle programme en rekeninge maak, nie net Google Kontakte nie, sal tussen die web en jou toestelle op datum gehou word."</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"Skakel aan"</string>
<string name="connection_error_message" msgid="7446131881946138093">"Geen verbinding nie"</string>
<string name="single_sim_display_label" msgid="264062966309455515">"SIM"</string>
<string name="show_more_content_description" msgid="6298277298495491712">"Wys meer"</string>
<string name="importing_sim_finished_title" msgid="6436721150882268416">"Klaar SIM-kaart ingevoer"</string>
<string name="importing_sim_failed_title" msgid="1046154274170241788">"Kon nie invoer nie"</string>
Expand Down
5 changes: 0 additions & 5 deletions res/values-am/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@
<string name="deleteConfirmation" msgid="3727809366015979585">"ይህ እውቂያ ይሰረዝ?"</string>
<string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"ሰርዝ"</string>
<string name="invalidContactMessage" msgid="6204402264821083362">"ዕውቅያው የለም።"</string>
<string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"እውቂያ ወደ መነሻ ማያ ገፅ ታክሏል።"</string>
<string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> ወደ መነሻ ማያ ገፅ ታክሏል።"</string>
<string name="photoPickerNotFoundText" msgid="6535222297923110991">"በመሣሪያው ላይ ፎቶዎች የሉም።"</string>
<string name="attach_photo_dialog_title" msgid="7948754072673745235">"የዕውቂያ ፎቶ"</string>
<string name="customLabelPickerTitle" msgid="816694850254307154">"ብጁ መሰየሚያ ስም"</string>
Expand Down Expand Up @@ -251,7 +249,6 @@
<string name="call_work_pager" msgid="615335008331933747">"የሥራ ጥሪ ምልክት ማድረጊያ"</string>
<string name="call_assistant" msgid="8556909944379826616">"ጥሪ <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="call_mms" msgid="1760746475672950386">"MMS ጥሪ"</string>
<string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (ጥሪ)"</string>
<string name="sms_custom" msgid="3684453744622817362">"ጽሁፍ <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="sms_home" msgid="6132392861245316613">"የፅሁፍመነሻ"</string>
<string name="sms_mobile" msgid="433949735070334192">"የ ተንቀሳቃሽፅሁፍ"</string>
Expand All @@ -273,7 +270,6 @@
<string name="sms_work_pager" msgid="8827367747655005608">"የፅሁፍ ሥራ ምልክት ማድረጊያ"</string>
<string name="sms_assistant" msgid="245045451580096547">"ጽሁፍ <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="7395133080765833725">"የMMS ጽሁፍ"</string>
<string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (መልዕክት)"</string>
<string name="description_video_call" msgid="4956825008907720371">"የቪዲዮ ጥሪ ያድርጉ"</string>
<string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"በተደጋጋሚ ያገኝዋቸው ይጽዱ?"</string>
<string name="clearFrequentsConfirmation" msgid="2120741757522063938">"በእውቂያዎች እና በስልክ መተግበሪያዎች ውስጥ በተደጋጋሚ ያገኟቸውን እውቂያዎች ዝርዝር አጽድተው የኢሜይል መተግበሪያዎች የአድራሻ አያያዝ ምርጫዎችዎን ከባዶ ተነስተው እንዲያውቁ ያስገድዱዋቸዋል።"</string>
Expand Down Expand Up @@ -484,7 +480,6 @@
<string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"በGoogle እውቂያዎች ላይ ብቻ ሳይሆን፣ በሁሉም መተግበሪያዎች እና መለያዎች ላይ የሚያደርጓቸው ለውጦች፣ በድር እና በመሳሪያዎችዎ መካከል እንደዘመኑ ይቆያሉ።"</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"አብራ"</string>
<string name="connection_error_message" msgid="7446131881946138093">"ምንም ግንኙነት የለም"</string>
<string name="single_sim_display_label" msgid="264062966309455515">"ሲም"</string>
<string name="show_more_content_description" msgid="6298277298495491712">"ተጨማሪ አሳይ"</string>
<string name="importing_sim_finished_title" msgid="6436721150882268416">"ሲም ካርድ ማምጣት ጨርሷል"</string>
<string name="importing_sim_failed_title" msgid="1046154274170241788">"ማስመጣት አልተሳካም"</string>
Expand Down
5 changes: 0 additions & 5 deletions res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@
<string name="deleteConfirmation" msgid="3727809366015979585">"هل تريد حذف جهة الاتصال هذه؟"</string>
<string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"حذف"</string>
<string name="invalidContactMessage" msgid="6204402264821083362">"جهة الاتصال غير موجودة."</string>
<string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"تمت إضافة جهة الاتصال إلى الشاشة الرئيسية."</string>
<string name="createContactShortcutSuccessful" msgid="6980032407920515698">"تمت إضافة <xliff:g id="NAME">%s</xliff:g> إلى الشاشة الرئيسية."</string>
<string name="photoPickerNotFoundText" msgid="6535222297923110991">"لا تتوفر أي صور على الهاتف."</string>
<string name="attach_photo_dialog_title" msgid="7948754072673745235">"صورة جهة الاتصال"</string>
<string name="customLabelPickerTitle" msgid="816694850254307154">"اسم تصنيف مخصص"</string>
Expand Down Expand Up @@ -251,7 +249,6 @@
<string name="call_work_pager" msgid="615335008331933747">"الاتصال بجهاز نداء العمل"</string>
<string name="call_assistant" msgid="8556909944379826616">"الاتصال على <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="call_mms" msgid="1760746475672950386">"اتصال بهاتف رسائل الوسائط المتعددة"</string>
<string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (اتصال)"</string>
<string name="sms_custom" msgid="3684453744622817362">"إرسال رسال نصية إلى <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="sms_home" msgid="6132392861245316613">"إرسال رسالة نصية إلى هاتف منزلي"</string>
<string name="sms_mobile" msgid="433949735070334192">"إرسال رسالة نصية إلى جوال"</string>
Expand All @@ -273,7 +270,6 @@
<string name="sms_work_pager" msgid="8827367747655005608">"إرسال رسالة نصية قصيرة على جهاز نداء العمل"</string>
<string name="sms_assistant" msgid="245045451580096547">"إرسال رسالة نصية إلى <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="7395133080765833725">"إرسال رسالة وسائط متعددة"</string>
<string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (رسالة)"</string>
<string name="description_video_call" msgid="4956825008907720371">"إجراء مكالمة فيديو"</string>
<string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"هل تريد محو قائمة من يُتصل بهم كثيرًا؟"</string>
<string name="clearFrequentsConfirmation" msgid="2120741757522063938">"ستمحو قائمة الأشخاص الذين يتم التواصل معهم كثيرًا في تطبيقي \"جهات الاتصال\" و\"الهاتف\"، وستفرض بالتالي على تطبيقات البريد الإلكتروني التعرف مجدّدًا على جهات الاتصال المفضّلة لديك."</string>
Expand Down Expand Up @@ -484,7 +480,6 @@
<string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"‏سيتم إعادة تحميل التغييرات التي أجريتها على كل التطبيقات والحسابات، وليس فقط جهات اتصال Google، بين الويب وأجهزتك."</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"تشغيل"</string>
<string name="connection_error_message" msgid="7446131881946138093">"لا اتصال"</string>
<string name="single_sim_display_label" msgid="264062966309455515">"‏شريحة SIM"</string>
<string name="show_more_content_description" msgid="6298277298495491712">"عرض المزيد"</string>
<string name="importing_sim_finished_title" msgid="6436721150882268416">"‏انتهى استيراد شريحة SIM"</string>
<string name="importing_sim_failed_title" msgid="1046154274170241788">"تعذّر الاستيراد"</string>
Expand Down
5 changes: 0 additions & 5 deletions res/values-as/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@
<string name="deleteConfirmation" msgid="3727809366015979585">"এই সম্পৰ্কটো মচিবনে?"</string>
<string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"মচক"</string>
<string name="invalidContactMessage" msgid="6204402264821083362">"এই সম্পৰ্কটো নাই।"</string>
<string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"সম্পৰ্কক গৃহ স্ক্ৰীনত যোগ কৰা হ’ল।"</string>
<string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g>ক গৃহ স্ক্ৰীনত যোগ কৰা হ’ল।"</string>
<string name="photoPickerNotFoundText" msgid="6535222297923110991">"এই ডিভাইচত কোনো চিত্ৰ নাই।"</string>
<string name="attach_photo_dialog_title" msgid="7948754072673745235">"সম্পৰ্ক ব্যক্তিৰ ফট\'"</string>
<string name="customLabelPickerTitle" msgid="816694850254307154">"উপযোগিতা অনুসৰি লেবেলৰ নাম"</string>
Expand Down Expand Up @@ -251,7 +249,6 @@
<string name="call_work_pager" msgid="615335008331933747">"কৰ্মস্থানৰ পেজাৰৰ নম্বৰলৈ কল কৰক"</string>
<string name="call_assistant" msgid="8556909944379826616">"<xliff:g id="CUSTOM_LABEL">%s</xliff:g>ত কল কৰক"</string>
<string name="call_mms" msgid="1760746475672950386">"এমএমএছ নম্বৰত কল কৰক"</string>
<string name="call_by_shortcut" msgid="5707329943368933423">"<xliff:g id="CONTACT_NAME">%s</xliff:g>ক (কল কৰক)"</string>
<string name="sms_custom" msgid="3684453744622817362">"বাৰ্তা পঠিয়াওক <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>
<string name="sms_home" msgid="6132392861245316613">"ঘৰৰ নম্বৰলৈ বাৰ্তা পঠিয়াওক"</string>
<string name="sms_mobile" msgid="433949735070334192">"ম’বাইল নম্বৰলৈ বাৰ্তা পঠিয়াওক"</string>
Expand All @@ -273,7 +270,6 @@
<string name="sms_work_pager" msgid="8827367747655005608">"কৰ্মস্থানৰ পেজাৰ নম্বৰত বাৰ্তা পঠিয়াওক"</string>
<string name="sms_assistant" msgid="245045451580096547">"বাৰ্তা পঠিয়াওক <xliff:g id="ASSISTANT">%s</xliff:g>"</string>
<string name="sms_mms" msgid="7395133080765833725">"এমএমএছ নম্বৰত বাৰ্তা পঠাওক"</string>
<string name="sms_by_shortcut" msgid="4682340916268521006">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (বাৰ্তা)"</string>
<string name="description_video_call" msgid="4956825008907720371">"ভিডিঅ\' কল কৰক"</string>
<string name="clearFrequentsConfirmation_title" msgid="9194415661170740437">"সঘনাই যোগাযোগ কৰা সূচী মচিবনে?"</string>
<string name="clearFrequentsConfirmation" msgid="2120741757522063938">"আপুনি কন্টেক্ট আৰু ফ\'ন এপৰ সঘনাই যোগাযোগ কৰা সূচীটো মচিব আৰু ইমেইল এপসমূহক আপোনাৰ ঠিকনাৰ অগ্ৰাধিকাৰসমূহ আৰম্ভণিৰে পৰা শিকিবলৈ বাধ্য কৰাব।"</string>
Expand Down Expand Up @@ -484,7 +480,6 @@
<string name="turn_auto_sync_on_dialog_body" msgid="5386810641905184682">"আপুনি Google কনটেক্টৰ উপৰিও সকলো এপ্ আৰু একাউণ্টত কৰা পৰিবৰ্তনবোৰ ৱেব আৰু আপোনাৰ ডিভাইচবোৰত আপ টু ডেট ৰখা হ\'ব।"</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="5575717918836806519">"অন কৰক"</string>
<string name="connection_error_message" msgid="7446131881946138093">"ইণ্টাৰনেট নাই"</string>
<string name="single_sim_display_label" msgid="264062966309455515">"ছিম"</string>
<string name="show_more_content_description" msgid="6298277298495491712">"অধিক দেখুৱাওক"</string>
<string name="importing_sim_finished_title" msgid="6436721150882268416">"ছিম কাৰ্ডৰ আমদানি কৰা কাৰ্য সম্পূৰ্ণ হ’ল"</string>
<string name="importing_sim_failed_title" msgid="1046154274170241788">"আমদানি কৰিব পৰা নগ\'ল"</string>
Expand Down
Loading