From 80ed3ae416ba12dd21f343e734b6d3855701e9f5 Mon Sep 17 00:00:00 2001 From: Evan Severson Date: Tue, 19 May 2020 13:51:22 -0700 Subject: [PATCH] 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 --- packages/SettingsLib/Android.bp | 1 + packages/SettingsLib/Utils/Android.bp | 15 +++++ .../SettingsLib/Utils/AndroidManifest.xml | 23 ++++++++ .../SettingsLib/Utils/res/values/strings.xml | 20 +++++++ .../utils/applications/AppUtils.java | 59 +++++++++++++++++++ packages/SettingsLib/res/values/strings.xml | 3 - .../settingslib/applications/AppUtils.java | 20 ++----- 7 files changed, 122 insertions(+), 19 deletions(-) create mode 100644 packages/SettingsLib/Utils/Android.bp create mode 100644 packages/SettingsLib/Utils/AndroidManifest.xml create mode 100644 packages/SettingsLib/Utils/res/values/strings.xml create mode 100644 packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp index ac4e1ea11dae9..5afe2f3d2efc4 100644 --- a/packages/SettingsLib/Android.bp +++ b/packages/SettingsLib/Android.bp @@ -50,6 +50,7 @@ java_defaults { "SettingsLibAdaptiveIcon", "SettingsLibRadioButtonPreference", "SettingsLibDisplayDensityUtils", + "SettingsLibUtils", ], } diff --git a/packages/SettingsLib/Utils/Android.bp b/packages/SettingsLib/Utils/Android.bp new file mode 100644 index 0000000000000..c5f0ee6c939cc --- /dev/null +++ b/packages/SettingsLib/Utils/Android.bp @@ -0,0 +1,15 @@ +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", + ], +} diff --git a/packages/SettingsLib/Utils/AndroidManifest.xml b/packages/SettingsLib/Utils/AndroidManifest.xml new file mode 100644 index 0000000000000..fd89676ab6d7f --- /dev/null +++ b/packages/SettingsLib/Utils/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/packages/SettingsLib/Utils/res/values/strings.xml b/packages/SettingsLib/Utils/res/values/strings.xml new file mode 100644 index 0000000000000..035e7f230d604 --- /dev/null +++ b/packages/SettingsLib/Utils/res/values/strings.xml @@ -0,0 +1,20 @@ + + + + + + Work %s + \ No newline at end of file diff --git a/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java new file mode 100644 index 0000000000000..6125b8509fcfb --- /dev/null +++ b/packages/SettingsLib/Utils/src/com/android/settingslib/utils/applications/AppUtils.java @@ -0,0 +1,59 @@ +/* + * 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(); + } +} diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 9c7bdbd5b927a..8e8368f9bc622 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1374,9 +1374,6 @@ Your device must be rebooted for this change to apply. Reboot now or cancel. - - Work %s - Wired headphone diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/AppUtils.java b/packages/SettingsLib/src/com/android/settingslib/applications/AppUtils.java index b1f2a397bde6f..a6202956efa51 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/AppUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/AppUtils.java @@ -26,7 +26,6 @@ import android.hardware.usb.IUsbManager; import android.os.RemoteException; import android.os.SystemProperties; import android.os.UserHandle; -import android.os.UserManager; import android.util.Log; import com.android.settingslib.R; @@ -112,17 +111,8 @@ public class AppUtils { /** 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; + return com.android.settingslib.utils.applications.AppUtils + .getApplicationLabel(packageManager, packageName); } /** @@ -160,9 +150,7 @@ public class AppUtils { */ public static String getAppContentDescription(Context context, String packageName, int userId) { - final CharSequence appLabel = getApplicationLabel(context.getPackageManager(), packageName); - return UserManager.get(context).isManagedProfile(userId) - ? context.getString(R.string.accessibility_work_profile_app_description, appLabel) - : appLabel.toString(); + return com.android.settingslib.utils.applications.AppUtils.getAppContentDescription(context, + packageName, userId); } }