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

Commit 71f97682 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [16009370, 16012241, 16012242, 16012310, 16012367,... 

Merge cherrypicks of [16009370, 16012241, 16012242, 16012310, 16012367, 16012311, 16012312, 16012313, 16012216, 16012387, 16012388, 16012390, 16012335, 16012391] into security-aosp-qt-release

Change-Id: I7b940d5d27eb94200520ec64a30997bb1921fedc
parents 2b65ceda 41195837

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

+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.app;



import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

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



import android.annotation.Nullable;

import android.annotation.StringRes;
@@ -68,7 +69,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.BaseAdapter;
@@ -778,9 +781,22 @@ public class ResolverActivity extends Activity { 
        bindProfileView();

    }



    @Override

    protected void onStart() {

        super.onStart();



        this.getWindow().addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }



    @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) {

            mPackageMonitor.unregister();

            mRegistered = false;

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

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

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

    <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"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="1207197447013960896">"Jy gebruik hierdie program buite jou werkprofiel"</string>

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

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

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

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

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

    <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">\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="1207197447013960896">"ከስራ መገለጫዎ ውጪ ሆነው መተግበሪያ እየተጠቀሙ ነው"</string>

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

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

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

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

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

    <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"الإذن مطلوب\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="1207197447013960896">"أنت تستخدم هذا التطبيق خارج ملفك الشخصي للعمل"</string>

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

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

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

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

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

    <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"<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="1207197447013960896">"আপুনি আপোনাৰ কৰ্মস্থানৰ প্ৰ\'ফাইলৰ বাহিৰত এই এপটো ব্যৱহাৰ কৰি আছে"</string>

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

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