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

Commit 80ed3ae4 authored by Evan Severson's avatar Evan Severson
Browse files

Create module for settingslib which don't require platform_apis 

The method this change moves needs to be accessed by permission
controller which doesn't have access to platform apis. The new module
SettingsLibUtils requires system api. Other methods in SettingsLib which
don't need platform apis could also be moved into this module.

Test: Use talkback on permission screens
Bug: 127602715
Change-Id: I017fd22712c3e6eb38a0aa1fb95d4331e9b56a2a
parent a319112c

packages/SettingsLib/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ java_defaults { 
        "SettingsLibAdaptiveIcon",

        "SettingsLibRadioButtonPreference",

        "SettingsLibDisplayDensityUtils",

        "SettingsLibUtils",

    ],

}

packages/SettingsLib/Utils/Android.bp

0 → 100644
+15 −0
Original line number Diff line number Diff line 
android_library {

    name: "SettingsLibUtils",



    srcs: ["src/**/*.java"],

    resource_dirs: ["res"],



    sdk_version: "system_current",

    min_sdk_version: "21",



    apex_available: [



        "//apex_available:platform",

        "com.android.permission",

    ],

}

packages/SettingsLib/Utils/AndroidManifest.xml

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

<!--

  Copyright (C) 2020 The Android Open Source 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.

  -->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.settingslib.utils">



    <uses-sdk android:minSdkVersion="21" />



</manifest>

packages/SettingsLib/Utils/res/values/strings.xml

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

<!-- Copyright (C) 2020 The Android Open Source 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- A content description for work profile app [CHAR LIMIT=35] -->

    <string name="accessibility_work_profile_app_description">Work <xliff:g id="app_name" example="Camera">%s</xliff:g></string>

</resources>
 
 No newline at end of file

packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source 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.

 */



package com.android.settingslib.utils.applications;



import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.os.UserManager;

import android.util.Log;



import com.android.settingslib.utils.R;



public class AppUtils {



    private static final String TAG = AppUtils.class.getSimpleName();



    /** Returns the label for a given package. */

    public static CharSequence getApplicationLabel(

            PackageManager packageManager, String packageName) {

        try {

            final ApplicationInfo appInfo =

                    packageManager.getApplicationInfo(

                            packageName,

                            PackageManager.MATCH_DISABLED_COMPONENTS

                                    | PackageManager.MATCH_ANY_USER);

            return appInfo.loadLabel(packageManager);

        } catch (PackageManager.NameNotFoundException e) {

            Log.w(TAG, "Unable to find info for package: " + packageName);

        }

        return null;

    }



    /**

     * Returns a content description of an app name which distinguishes a personal app from a

     * work app for accessibility purpose.

     * If the app is in a work profile, then add a "work" prefix to the app name.

     */

    public static String getAppContentDescription(Context context, String packageName,

            int userId) {

        final CharSequence appLabel = getApplicationLabel(context.getPackageManager(), packageName);

        return context.getSystemService(UserManager.class).isManagedProfile(userId)

                ? context.getString(R.string.accessibility_work_profile_app_description, appLabel)

                : appLabel.toString();

    }

}