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

Commit 89eeeb09 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [16010620, 16011373, 16011377, 16011394, 16011395,... 

Merge cherrypicks of [16010620, 16011373, 16011377, 16011394, 16011395, 16011396, 16011398, 16011400, 16011402, 16012407, 16010623, 16011574, 16011575, 16010923, 16011434, 16011691, 16011382, 16011383, 16011303, 16011385, 16011579] into security-aosp-rvc-release

Change-Id: I952793ecd4994a18ed570c632f706d0ca6c7e7f7
parents 39472903 e5305805

core/java/com/android/internal/app/ResolverActivity.java

+11 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.internal.app; 
import static android.Manifest.permission.INTERACT_ACROSS_PROFILES;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import static android.content.PermissionChecker.PID_UNKNOWN;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.annotation.Nullable;

import android.annotation.StringRes;
@@ -69,7 +70,9 @@ import android.view.LayoutInflater; 
import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup.LayoutParams;

import android.view.Window;

import android.view.WindowInsets;

import android.view.WindowManager;

import android.widget.AbsListView;

import android.widget.AdapterView;

import android.widget.Button;
@@ -101,7 +104,6 @@ import java.util.List; 
import java.util.Objects;

import java.util.Set;





/**

 * This activity is displayed when the system attempts to start an Intent for

 * which there is more than one matching activity, allowing the user to decide
@@ -822,6 +824,8 @@ public class ResolverActivity extends Activity implements 
    @Override

    protected void onStart() {

        super.onStart();



        this.getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        if (shouldShowTabs()) {

            mWorkProfileStateReceiver = createWorkProfileStateReceiver();

            registerWorkProfileStateReceiver();
@@ -849,6 +853,12 @@ public class ResolverActivity extends Activity implements 
    @Override

    protected void onStop() {

        super.onStop();



        final Window window = this.getWindow();

        final WindowManager.LayoutParams attrs = window.getAttributes();

        attrs.privateFlags &= ~SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

        window.setAttributes(attrs);



        if (mRegistered) {

            mPersonalPackageMonitor.unregister();

            if (mWorkPackageMonitor != null) {

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

+1 −0
Original line number Diff line number Diff line
@@ -1413,6 +1413,7 @@ 
    <string name="deny" msgid="6632259981847676572">"Weier"</string>

    <string name="permission_request_notification_title" msgid="1810025922441048273">"Toestemming versoek"</string>

    <string name="permission_request_notification_with_subtitle" msgid="3743417870360129298">"Toestemming versoek\nvir rekening <xliff:g id="ACCOUNT">%s</xliff:g>."</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"Toestemming versoek deur <xliff:g id="APP">%1$s</xliff:g>\nvir rekening <xliff:g id="ACCOUNT">%2$s</xliff:g>"</string>

    <string name="forward_intent_to_owner" msgid="4620359037192871015">"Jy gebruik hierdie program buite jou werkprofiel"</string>

    <string name="forward_intent_to_work" msgid="3620262405636021151">"Jy gebruik tans hierdie program in jou werkprofiel"</string>

    <string name="input_method_binding_label" msgid="1166731601721983656">"Invoermetode"</string>

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

+1 −0
Original line number Diff line number Diff line
@@ -1413,6 +1413,7 @@ 
    <string name="deny" msgid="6632259981847676572">"ያስተባብሉ"</string>

    <string name="permission_request_notification_title" msgid="1810025922441048273">"ፈቃድ ተጠይቋል"</string>

    <string name="permission_request_notification_with_subtitle" msgid="3743417870360129298">\n" ለ<xliff:g id="ACCOUNT">%s</xliff:g> መለያ ፈቃድ ተጠይቋል"</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"ለመለያ <xliff:g id="ACCOUNT">%2$s</xliff:g>\nበ<xliff:g id="APP">%1$s</xliff:g> የተጠየቀ ፈቃድ።"</string>

    <string name="forward_intent_to_owner" msgid="4620359037192871015">"ከስራ መገለጫዎ ውጪ ሆነው መተግበሪያ እየተጠቀሙ ነው"</string>

    <string name="forward_intent_to_work" msgid="3620262405636021151">"ይህን መተግበሪያ በእርስዎ የስራ መገለጫ ላይ እየተጠቀሙበት ነው"</string>

    <string name="input_method_binding_label" msgid="1166731601721983656">"ግቤት ስልት"</string>

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

+1 −0
Original line number Diff line number Diff line
@@ -1493,6 +1493,7 @@ 
    <string name="deny" msgid="6632259981847676572">"رفض"</string>

    <string name="permission_request_notification_title" msgid="1810025922441048273">"الإذن مطلوب"</string>

    <string name="permission_request_notification_with_subtitle" msgid="3743417870360129298">"الإذن مطلوب\nللحساب <xliff:g id="ACCOUNT">%s</xliff:g>."</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"طلب تطبيق <xliff:g id="APP">%1$s</xliff:g> الإذن بالدخول\nإلى حساب <xliff:g id="ACCOUNT">%2$s</xliff:g>."</string>

    <string name="forward_intent_to_owner" msgid="4620359037192871015">"أنت تستخدم هذا التطبيق خارج ملفك الشخصي للعمل"</string>

    <string name="forward_intent_to_work" msgid="3620262405636021151">"أنت تستخدم هذا التطبيق في ملفك الشخصي للعمل"</string>

    <string name="input_method_binding_label" msgid="1166731601721983656">"طريقة الإرسال"</string>

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

+1 −0
Original line number Diff line number Diff line
@@ -1413,6 +1413,7 @@ 
    <string name="deny" msgid="6632259981847676572">"প্ৰত্যাখ্যান কৰক"</string>

    <string name="permission_request_notification_title" msgid="1810025922441048273">"অনুমতি বিচাৰি অনুৰোধ কৰা হৈছে"</string>

    <string name="permission_request_notification_with_subtitle" msgid="3743417870360129298">"<xliff:g id="ACCOUNT">%s</xliff:g> একাউণ্টৰ বাবে\nঅনুমতি বিচাৰি অনুৰোধ কৰা হৈছে।"</string>

    <string name="permission_request_notification_for_app_with_subtitle" msgid="1298704005732851350">"<xliff:g id="APP">%1$s</xliff:g>এ <xliff:g id="ACCOUNT">%2$s</xliff:g> একাউণ্টটো এক্সেছৰ \nঅনুমতি বিচাৰি অনুৰোধ জনাইছে।"</string>

    <string name="forward_intent_to_owner" msgid="4620359037192871015">"আপুনি আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ বাহিৰত এই এপটো ব্যৱহাৰ কৰি আছে"</string>

    <string name="forward_intent_to_work" msgid="3620262405636021151">"আপুনি আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ ভিতৰত এই এপটো ব্যৱহাৰ কৰি আছে"</string>

    <string name="input_method_binding_label" msgid="1166731601721983656">"ইনপুট পদ্ধতি"</string>