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

Commit d9a9601f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move the block bg activity starts toast msg to string resources"

parents 5bf79b4a ac213c6e

core/res/res/values/strings.xml

+7 −0
Original line number Original line Diff line number Diff line
@@ -4291,6 +4291,13 @@ 
    <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->

    <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->

    <string name="display_manager_overlay_display_secure_suffix">, secure</string>

    <string name="display_manager_overlay_display_secure_suffix">, secure</string>





    <!-- Activity starter -->

    <!-- Toast message for blocking background activity starts feature running in permissive mode -->

    <string name="activity_starter_block_bg_activity_starts_permissive">This background activity start from <xliff:g id="packageName" example="com.example">%1$s</xliff:g> will be blocked in future Q builds. See go/q-bg-block.</string>



    <!-- Toast message for blocking background activity starts feature running in enforcing mode -->

    <string name="activity_starter_block_bg_activity_starts_enforcing">Background activity start from <xliff:g id="packageName" example="com.example">%1$s</xliff:g> blocked. See go/q-bg-block. </string>



    <!-- Keyguard strings -->

    <!-- Keyguard strings -->

    <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->

    <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->

    <string name="kg_forgot_pattern_button_text">Forgot Pattern</string>

    <string name="kg_forgot_pattern_button_text">Forgot Pattern</string>

core/res/res/values/symbols.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -763,6 +763,8 @@ 
  <java-symbol type="string" name="display_manager_hdmi_display_name" />

  <java-symbol type="string" name="display_manager_hdmi_display_name" />

  <java-symbol type="string" name="display_manager_overlay_display_name" />

  <java-symbol type="string" name="display_manager_overlay_display_name" />

  <java-symbol type="string" name="display_manager_overlay_display_secure_suffix" />

  <java-symbol type="string" name="display_manager_overlay_display_secure_suffix" />

  <java-symbol type="string" name="activity_starter_block_bg_activity_starts_permissive" />

  <java-symbol type="string" name="activity_starter_block_bg_activity_starts_enforcing" />

  <java-symbol type="string" name="display_manager_overlay_display_title" />

  <java-symbol type="string" name="display_manager_overlay_display_title" />

  <java-symbol type="string" name="double_tap_toast" />

  <java-symbol type="string" name="double_tap_toast" />

  <java-symbol type="string" name="elapsed_time_short_format_h_mm_ss" />

  <java-symbol type="string" name="elapsed_time_short_format_h_mm_ss" />

services/core/java/com/android/server/wm/ActivityStarter.java

+7 −5
Original line number Original line Diff line number Diff line
@@ -98,6 +98,7 @@ import android.content.pm.PackageManager; 
import android.content.pm.ResolveInfo;

import android.content.pm.ResolveInfo;

import android.content.pm.UserInfo;

import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Rect;

import android.graphics.Rect;

import android.os.Binder;

import android.os.Binder;

import android.os.Bundle;

import android.os.Bundle;
@@ -115,6 +116,7 @@ import android.util.Pools.SynchronizedPool; 
import android.util.Slog;

import android.util.Slog;

import android.widget.Toast;

import android.widget.Toast;





import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.HeavyWeightSwitcherActivity;

import com.android.internal.app.HeavyWeightSwitcherActivity;

import com.android.internal.app.IVoiceInteractor;

import com.android.internal.app.IVoiceInteractor;
@@ -761,11 +763,11 @@ class ActivityStarter { 
            abort |= (abortBackgroundStart && !mService.isBackgroundActivityStartsEnabled());

            abort |= (abortBackgroundStart && !mService.isBackgroundActivityStartsEnabled());

            // TODO: remove this toast after feature development is done

            // TODO: remove this toast after feature development is done

            if (abortBackgroundStart) {

            if (abortBackgroundStart) {

                final String toastMsg = abort

                final Resources res = mService.mContext.getResources();

                        ? "Background activity start from " + callingPackage

                final String toastMsg = res.getString(abort

                                + " blocked. See go/q-bg-block."

                            ? R.string.activity_starter_block_bg_activity_starts_enforcing

                        : "This background activity start from " + callingPackage

                            : R.string.activity_starter_block_bg_activity_starts_permissive,

                                + " will be blocked in future Q builds. See go/q-bg-block.";

                        callingPackage);

                mService.mUiHandler.post(() -> {

                mService.mUiHandler.post(() -> {

                    Toast.makeText(mService.mContext, toastMsg, Toast.LENGTH_LONG).show();

                    Toast.makeText(mService.mContext, toastMsg, Toast.LENGTH_LONG).show();

                });

                });