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

Commit 3b99e64e authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 8475 into donut 

* changes:
  Per conversation, remove the toast while saving the Certificates to CertTools.
parents 7c187de1 c9d4c879

core/java/android/webkit/LoadListener.java

+0 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.os.Message; 
import android.security.CertTool;

import android.util.Log;

import android.webkit.CacheManager.CacheResult;

import android.widget.Toast;



import com.android.internal.R;
@@ -1016,8 +1015,6 @@ class LoadListener extends Handler implements EventHandler { 
                mDataBuilder.releaseChunk(c);

            }

            CertTool.getInstance().addCertificate(cert, mContext);

            Toast.makeText(mContext, R.string.certificateSaved,

                    Toast.LENGTH_SHORT).show();

            mBrowserFrame.stopLoading();

            return;

        }

core/res/res/values-cs/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ 
    <string name="httpErrorFile">"K souboru nelze získat přístup."</string>

    <string name="httpErrorFileNotFound">"Požadovaný soubor nebyl nalezen."</string>

    <string name="httpErrorTooManyRequests">"Je zpracováváno příliš mnoho požadavků. Opakujte akci později."</string>

    <string name="certificateSaved">"Certifikát je uložen v systémovém úložišti klíčů."</string>

    <string name="contentServiceSync">"Synchronizace"</string>

    <string name="contentServiceSyncNotificationTitle">"Synchronizace"</string>

    <string name="contentServiceTooManyDeletesNotificationDesc">"Příliš mnoho smazaných položek služby <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string>

core/res/res/values-da/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ 
    <string name="httpErrorFile">"Der kunne ikke oprettes adgang til filen."</string>

    <string name="httpErrorFileNotFound">"Den anmodede fil blev ikke fundet."</string>

    <string name="httpErrorTooManyRequests">"Der behandles for mange anmodninger. Prøv igen senere."</string>

    <!-- no translation found for certificateSaved (2832076323378077191) -->

    <skip />

    <string name="contentServiceSync">"Synkroniser"</string>

    <string name="contentServiceSyncNotificationTitle">"Synkroniser"</string>

    <string name="contentServiceTooManyDeletesNotificationDesc">"For mange <xliff:g id="CONTENT_TYPE">%s</xliff:g> sletninger"</string>

core/res/res/values-de/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ 
    <string name="httpErrorFile">"Auf die Datei konnte nicht zugegriffen werden."</string>

    <string name="httpErrorFileNotFound">"Die angeforderte Datei wurde nicht gefunden."</string>

    <string name="httpErrorTooManyRequests">"Es werden zurzeit zu viele Anfragen verarbeitet. Versuchen Sie es später erneut."</string>

    <string name="certificateSaved">"Das Zertifikat wird im Schlüsselspeicher des Systems gespeichert."</string>

    <string name="contentServiceSync">"Synchronisieren"</string>

    <string name="contentServiceSyncNotificationTitle">"Synchronisieren"</string>

    <string name="contentServiceTooManyDeletesNotificationDesc">"Zu viele <xliff:g id="CONTENT_TYPE">%s</xliff:g> gelöscht."</string>

core/res/res/values-el/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ 
    <string name="httpErrorFile">"Η πρόσβαση στο αρχείο δεν ήταν δυνατή."</string>

    <string name="httpErrorFileNotFound">"Το αρχείο που ζητήθηκε δεν βρέθηκε."</string>

    <string name="httpErrorTooManyRequests">"Πραγματοποιείται επεξεργασία πάρα πολλών αιτημάτων. Προσπαθήστε ξανά αργότερα."</string>

    <!-- no translation found for certificateSaved (2832076323378077191) -->

    <skip />

    <string name="contentServiceSync">"Συγχρονισμός"</string>

    <string name="contentServiceSyncNotificationTitle">"Συγχρονισμός"</string>

    <string name="contentServiceTooManyDeletesNotificationDesc">"Πάρα πολλές <xliff:g id="CONTENT_TYPE">%s</xliff:g> διαγραφές."</string>