Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4dc1224d authored by Marcus Hagerott's avatar Marcus Hagerott
Browse files

Change SIM import error notification 

Shortened the title string for easier localization and changed the
notification icon.

Test: manually verified notification is displayed as expected by
modifying code to exercise error case

Bug 32781237
Bug 33229518

Change-Id: I7ba2f0e1dbfbabb5bd59904bb9bf5f91174b957f
parent 3f6a2444

res/drawable/ic_error_black_24dp.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!-- Copyright (C) 2016 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.

-->



<!-- From https://material.io/icons/#ic_error -->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>

</vector>

res/values/strings.xml

+5 −2
Original line number Diff line number Diff line
@@ -1667,7 +1667,7 @@ 
    <!-- Dialog title when selecting the bulk operation to perform from a list. [CHAR LIMIT=36] -->

    <string name="dialog_export">Export contacts</string>



    <!-- Dialog title when importing contacts from an external source. [CHAR LIMIT=36] -->

    <!-- Dialog title when importing contacts from an external source such as SIM card or a vcf file. [CHAR LIMIT=36] -->

    <string name="dialog_import">Import contacts from</string>



    <!-- Toast indicating that sharing a contact has failed. [CHAR LIMIT=NONE]  -->
@@ -1908,7 +1908,10 @@ 
    <string name="importing_sim_finished_title">Finished importing SIM card</string>



    <!-- Notification title shown when importing SIM contacts failed [CHAR LIMIT=40] -->

    <string name="importing_sim_failed_title">Couldn\'t import SIM card</string>

    <string name="importing_sim_failed_title">Import failed</string>



    <!-- Notification message shown when importing SIM contacts failed [CHAR LIMIT=NONE] -->

    <string name="importing_sim_failed_message">Couldn\'t import contacts from SIM card</string>



    <!-- The notification title shown while SIM contacts are being imported [CHAR LIMIT=40] -->

    <string name="importing_sim_in_progress_title">Importing SIM</string>

src/com/android/contacts/SimImportService.java

+2 −1
Original line number Diff line number Diff line
@@ -203,8 +203,9 @@ public class SimImportService extends Service { 
        builder.setOngoing(false)

                .setAutoCancel(true)

                .setContentTitle(this.getString(R.string.importing_sim_failed_title))

                .setContentText(this.getString(R.string.importing_sim_failed_message))

                .setColor(this.getResources().getColor(R.color.dialtacts_theme_color))

                .setSmallIcon(R.drawable.ic_check_mark)

                .setSmallIcon(R.drawable.ic_error_black_24dp)

                .setContentIntent(PendingIntent.getActivity(this, 0, intent, 0));

        return builder.build();

    }