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

Commit 2223d96d authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8920865 from a9aaecab to tm-qpr1-release 

Change-Id: I52b1b2f12cbfd622aaa241f2aae2efdd76e071ff
parents 79e12f7f a9aaecab

core/java/android/app/ActivityTransitionState.java

+0 −10
Original line number Diff line number Diff line
@@ -263,11 +263,6 @@ class ActivityTransitionState { 
        // After orientation change, the onResume can come in before the top Activity has

        // left, so if the Activity is not top, wait a second for the top Activity to exit.

        if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) {

            if (mEnterTransitionCoordinator != null) {

                mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {

                    mEnterTransitionCoordinator = null;

                });

            }

            restoreExitedViews();

            restoreReenteringViews();

        } else {
@@ -276,11 +271,6 @@ class ActivityTransitionState { 
                public void run() {

                    if (mEnterTransitionCoordinator == null ||

                            mEnterTransitionCoordinator.isWaitingForRemoteExit()) {

                        if (mEnterTransitionCoordinator != null) {

                            mEnterTransitionCoordinator.runAfterTransitionsComplete(() -> {

                                mEnterTransitionCoordinator = null;

                            });

                        }

                        restoreExitedViews();

                        restoreReenteringViews();

                    } else if (mEnterTransitionCoordinator.isReturning()) {

core/java/android/appwidget/AppWidgetHostView.java

+11 −5
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ public class AppWidgetHostView extends FrameLayout { 
    private boolean mOnLightBackground;

    private SizeF mCurrentSize = null;

    private RemoteViews.ColorResources mColorResources = null;

    private SparseIntArray mColorMapping = null;

    // Stores the last remote views last inflated.

    private RemoteViews mLastInflatedRemoteViews = null;

    private long mLastInflatedRemoteViewsId = -1;
@@ -900,11 +899,19 @@ public class AppWidgetHostView extends FrameLayout { 
     * {@link android.R.color#system_neutral1_500}.

     */

    public void setColorResources(@NonNull SparseIntArray colorMapping) {

        if (mColorMapping != null && isSameColorMapping(mColorMapping, colorMapping)) {

        if (mColorResources != null

                && isSameColorMapping(mColorResources.getColorMapping(), colorMapping)) {

            return;

        }

        mColorMapping = colorMapping.clone();

        mColorResources = RemoteViews.ColorResources.create(mContext, mColorMapping);

        setColorResources(RemoteViews.ColorResources.create(mContext, colorMapping));

    }



    /** @hide **/

    public void setColorResources(RemoteViews.ColorResources colorResources) {

        if (colorResources == mColorResources) {

            return;

        }

        mColorResources = colorResources;

        mColorMappingChanged = true;

        mViewMode = VIEW_MODE_NOINIT;

        reapplyLastRemoteViews();
@@ -934,7 +941,6 @@ public class AppWidgetHostView extends FrameLayout { 
    public void resetColorResources() {

        if (mColorResources != null) {

            mColorResources = null;

            mColorMapping = null;

            mColorMappingChanged = true;

            mViewMode = VIEW_MODE_NOINIT;

            reapplyLastRemoteViews();

core/java/android/widget/RemoteViews.java

+193 −178

File changed.

Preview size limit exceeded, changes collapsed.

core/java/com/android/server/SystemConfig.java

+20 −0
Original line number Diff line number Diff line
@@ -339,6 +339,8 @@ public class SystemConfig { 
    // A map from package name of vendor APEXes that can be updated to an installer package name

    // allowed to install updates for it.

    private final ArrayMap<String, String> mAllowedVendorApexes = new ArrayMap<>();

    // A set of package names that are allowed to use <install-constraints> manifest tag.

    private final Set<String> mInstallConstraintsAllowlist = new ArraySet<>();



    private String mModulesInstallerPackageName;
@@ -535,6 +537,10 @@ public class SystemConfig { 
        return mAllowedVendorApexes;

    }



    public Set<String> getInstallConstraintsAllowlist() {

        return mInstallConstraintsAllowlist;

    }



    public String getModulesInstallerPackageName() {

        return mModulesInstallerPackageName;

    }
@@ -1455,6 +1461,20 @@ public class SystemConfig { 
                        }

                        XmlUtils.skipCurrentTag(parser);

                    } break;

                    case "install-constraints-allowed": {

                        if (allowAppConfigs) {

                            String packageName = parser.getAttributeValue(null, "package");

                            if (packageName == null) {

                                Slog.w(TAG, "<" + name + "> without package in " + permFile

                                        + " at " + parser.getPositionDescription());

                            } else {

                                mInstallConstraintsAllowlist.add(packageName);

                            }

                        } else {

                            logNotAllowedInPartition(name, permFile, parser);

                        }

                        XmlUtils.skipCurrentTag(parser);

                    } break;

                    default: {

                        Slog.w(TAG, "Tag " + name + " is unknown in "

                                + permFile + " at " + parser.getPositionDescription());

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

+12 −8
Original line number Diff line number Diff line
@@ -614,6 +614,7 @@ 
    <string name="fingerprint_error_hw_not_present" msgid="578914350967423382">"Hierdie toetstel het nie \'n vingerafdruksensor nie."</string>

    <string name="fingerprint_error_security_update_required" msgid="7750187320640856433">"Sensor is tydelik gedeaktiveer."</string>

    <string name="fingerprint_error_bad_calibration" msgid="4385512597740168120">"Kan nie vingerafdruksensor gebruik nie. Besoek \'n verskaffer wat herstelwerk doen"</string>

    <string name="fingerprint_error_power_pressed" msgid="5479524500542129414">"Aan/af-skakelaar is gedruk"</string>

    <string name="fingerprint_name_template" msgid="8941662088160289778">"Vinger <xliff:g id="FINGERID">%d</xliff:g>"</string>

    <string name="fingerprint_app_setting_name" msgid="4253767877095495844">"Gebruik vingerafdruk"</string>

    <string name="fingerprint_or_screen_lock_app_setting_name" msgid="3501743523487644907">"Gebruik vingerafdruk of skermslot"</string>
@@ -654,8 +655,10 @@ 
    <string name="face_acquired_roll_too_extreme" msgid="8261939882838881194">"Kyk meer reguit na jou foon"</string>

    <string name="face_acquired_obscured" msgid="4917643294953326639">"Verwyder enigiets wat jou gesig versteek."</string>

    <string name="face_acquired_sensor_dirty" msgid="8968391891086721678">"Maak die bokant van jou skerm skoon, insluitend die swart balk"</string>

    <string name="face_acquired_dark_glasses_detected" msgid="7263638432128692048">"Jou gesig moet heeltemal sigbaar wees"</string>

    <string name="face_acquired_mouth_covering_detected" msgid="615991670821926847">"Jou gesig moet heeltemal sigbaar wees"</string>

    <!-- no translation found for face_acquired_dark_glasses_detected (5643703296620631986) -->

    <skip />

    <!-- no translation found for face_acquired_mouth_covering_detected (8219428572168642593) -->

    <skip />

    <string name="face_acquired_recalibrate_alt" msgid="5702674220280332115">"Kan nie jou gesigmodel skep nie. Probeer weer."</string>

    <string name="face_acquired_dark_glasses_detected_alt" msgid="4052123776406041972">"Donkerbril bespeur. Jou gesig moet heeltemal sigbaar wees."</string>

    <string name="face_acquired_mouth_covering_detected_alt" msgid="1122294982850589766">"Gesigbedekking bespeur. Jou gesig moet heeltemal sigbaar wees."</string>
@@ -1941,18 +1944,19 @@ 
    <string name="app_streaming_blocked_title_for_camera_dialog" msgid="3935701653713853065">"Kamera is nie beskikbaar nie"</string>

    <string name="app_streaming_blocked_title_for_fingerprint_dialog" msgid="3516853717714141951">"Gaan voort op foon"</string>

    <string name="app_streaming_blocked_title_for_microphone_dialog" msgid="544822455127171206">"Mikrofoon is nie beskikbaar nie"</string>

    <string name="app_streaming_blocked_title_for_playstore_dialog" msgid="8149823099822897538">"Play Winkel is nie beskikbaar nie"</string>

    <string name="app_streaming_blocked_title_for_settings_dialog" product="tv" msgid="196994247017450357">"Android TV-instellings is nie beskikbaar nie"</string>

    <string name="app_streaming_blocked_title_for_settings_dialog" product="tablet" msgid="8222710146267948647">"Tabletinstellings is nie beskikbaar nie"</string>

    <string name="app_streaming_blocked_title_for_settings_dialog" product="default" msgid="6895719984375299791">"Fooninstellings is nie beskikbaar nie"</string>

    <string name="app_streaming_blocked_message" product="tv" msgid="5024599278277957935">"Jou <xliff:g id="DEVICE">%1$s</xliff:g> kan nie toegang hiertoe kry nie. Probeer eerder op jou Android TV-toestel."</string>

    <string name="app_streaming_blocked_message" product="tablet" msgid="7491114163056552686">"Jou <xliff:g id="DEVICE">%1$s</xliff:g> kan nie toegang hiertoe kry nie. Probeer eerder op jou tablet."</string>

    <string name="app_streaming_blocked_message" product="default" msgid="1245180131667647277">"Jou <xliff:g id="DEVICE">%1$s</xliff:g> kan nie toegang hiertoe kry nie. Probeer eerder op jou foon."</string>

    <string name="app_streaming_blocked_message_for_permission_dialog" product="tv" msgid="6306583663205997979">"Jy kan nie nou toegang hiertoe op jou <xliff:g id="DEVICE">%1$s</xliff:g> kry nie. Probeer eerder op jou Android TV-toestel."</string>

    <string name="app_streaming_blocked_message_for_permission_dialog" product="tablet" msgid="6545624942642129664">"Jy kan nie nou toegang hiertoe op jou <xliff:g id="DEVICE">%1$s</xliff:g> kry nie. Probeer eerder op jou tablet."</string>

    <string name="app_streaming_blocked_message_for_permission_dialog" product="default" msgid="8462740631707923000">"Jy kan nie nou toegang hiertoe op jou <xliff:g id="DEVICE">%1$s</xliff:g> kry nie. Probeer eerder op jou foon."</string>

    <string name="app_streaming_blocked_message" product="tv" msgid="4003011766528814377">"Jy kan nie nou toegang hiertoe op jou <xliff:g id="DEVICE">%1$s</xliff:g> kry nie. Probeer eerder op jou Android TV-toestel."</string>

    <string name="app_streaming_blocked_message" product="tablet" msgid="4242053045964946062">"Jy kan nie nou toegang hiertoe op jou <xliff:g id="DEVICE">%1$s</xliff:g> kry nie. Probeer eerder op jou tablet."</string>

    <string name="app_streaming_blocked_message" product="default" msgid="6159168735030739398">"Jy kan nie nou toegang hiertoe op jou <xliff:g id="DEVICE">%1$s</xliff:g> kry nie. Probeer eerder op jou foon."</string>

    <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tv" msgid="3470977315395784567">"Hierdie program versoek tans bykomende sekuriteit. Probeer eerder op jou Android TV-toestel."</string>

    <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="tablet" msgid="698460091901465092">"Hierdie program versoek tans bykomende sekuriteit. Probeer eerder op jou tablet."</string>

    <string name="app_streaming_blocked_message_for_fingerprint_dialog" product="default" msgid="8552691971910603907">"Hierdie program versoek tans bykomende sekuriteit. Probeer eerder op jou foon."</string>

    <string name="app_streaming_blocked_message_for_settings_dialog" product="tv" msgid="820334666354451145">"Jy kan nie op jou <xliff:g id="DEVICE">%1$s</xliff:g> toegang hiertoe kry nie. Probeer eerder op jou Android TV-toestel."</string>

    <string name="app_streaming_blocked_message_for_settings_dialog" product="tablet" msgid="3286849551133045896">"Jy kan nie op jou <xliff:g id="DEVICE">%1$s</xliff:g> toegang hiertoe kry nie. Probeer eerder op jou tablet."</string>

    <string name="app_streaming_blocked_message_for_settings_dialog" product="default" msgid="6264287556598916295">"Jy kan nie op jou <xliff:g id="DEVICE">%1$s</xliff:g> toegang hiertoe kry nie. Probeer eerder op jou foon."</string>

    <string name="deprecated_target_sdk_message" msgid="5203207875657579953">"Hierdie program is vir \'n ouer weergawe van Android gebou en sal dalk nie behoorlik werk nie. Probeer kyk vir opdaterings, of kontak die ontwikkelaar."</string>

    <string name="deprecated_target_sdk_app_store" msgid="8456784048558808909">"Kyk vir opdatering"</string>

    <string name="new_sms_notification_title" msgid="6528758221319927107">"Jy het nuwe boodskappe"</string>