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

Commit 314e830d authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '3571-a14-sept' into 'v3.1-a14' 

[a14] Add September security patches

See merge request e/os/android_packages_apps_DocumentsUI!47
parents d25f10ae e9e93c60

res/values-iw/lineage_strings.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>

    <string name="menu_add_shortcut">הוספת קיצור דרך למסך הפעלה</string>

</resources>

res/values-ug/lineage_strings.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2022 The LineageOS Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



        http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<resources>

    <string name="menu_add_shortcut">قوزغاتقۇچ تېزلەتمىسىنى قوش</string>

</resources>

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ 
    <!-- Confrim dialog title show on open document tree flow. [CHAR_LIMIT=80] -->

    <string name="open_tree_dialog_title">Allow <xliff:g id="appName" example="Drive">%1$s</xliff:g> to access files in <xliff:g id="directory" example="DCIM">%2$s</xliff:g>?</string>

    <!-- Confrim dialog message show on open document tree flow.-->

    <string name="open_tree_dialog_message">This will let <xliff:g id="appName" example="Drive">%1$s</xliff:g> access current and future content stored in <xliff:g id="directory" example="DCIM">%2$s</xliff:g>.</string>

    <string name="open_tree_dialog_message">This will let "<xliff:g id="appName" example="Drive">%1$s</xliff:g>" access current and future content stored in <xliff:g id="directory" example="DCIM">%2$s</xliff:g>.</string>

    <!-- Header message title show on open document tree flow when directory is blocked. [CHAR_LIMIT=48] -->

    <string name="directory_blocked_header_title">Can\u2019t use this folder</string>

    <!-- Header message subtitle show on open document tree flow when directory is blocked. [CHAR_LIMIT=90]-->

src/com/android/documentsui/base/Shared.java

+10 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.documentsui.base;



import static android.text.TextUtils.SAFE_STRING_FLAG_SINGLE_LINE;

import static android.text.TextUtils.SAFE_STRING_FLAG_TRIM;



import static com.android.documentsui.base.SharedMinimal.TAG;



import android.app.Activity;
@@ -276,7 +279,7 @@ public final class Shared { 
     * @return the calling app name or general anonymous name if not found

     */

    @NonNull

    public static String getCallingAppName(Activity activity) {

    public static CharSequence getCallingAppName(Activity activity) {

        final String anonymous = activity.getString(R.string.anonymous_application);

        final String packageName = getCallingPackageName(activity);

        if (TextUtils.isEmpty(packageName)) {
@@ -292,7 +295,12 @@ public final class Shared { 
        }



        CharSequence result = pm.getApplicationLabel(ai);

        return TextUtils.isEmpty(result) ? anonymous : result.toString();

        if (TextUtils.isEmpty(result)) {

            return anonymous;

        }



        return TextUtils.makeSafeForPresentation(

                result.toString(), 500, 0, SAFE_STRING_FLAG_TRIM | SAFE_STRING_FLAG_SINGLE_LINE);

    }



    /**

src/com/android/documentsui/dirlist/DirectoryFragment.java

+0 −5
Original line number Diff line number Diff line
@@ -1560,10 +1560,5 @@ public class DirectoryFragment extends Fragment implements SwipeRefreshLayout.On 
        public ActionHandler getActionHandler() {

            return mActions;

        }



        @Override

        public String getCallingAppName() {

            return Shared.getCallingAppName(mActivity);

        }

    }

}