diff options
author | Fan Zhang <zhfan@google.com> | 2017-05-15 11:28:25 -0700 |
---|---|---|
committer | Fan Zhang <zhfan@google.com> | 2017-05-15 13:22:51 -0700 |
commit | 9834bd82da89cd777aaa5005760f90b95f0b292d (patch) | |
tree | 5e71c40be0c7d0ad29d54b3b2736cb67b8f3290f /src/com/android/settings/applications/DrawOverlayDetails.java | |
parent | 5230ffe3a53a098c5d730d645418146c700ff601 (diff) | |
download | packages_apps_Settings-9834bd82da89cd777aaa5005760f90b95f0b292d.tar.gz packages_apps_Settings-9834bd82da89cd777aaa5005760f90b95f0b292d.tar.bz2 packages_apps_Settings-9834bd82da89cd777aaa5005760f90b95f0b292d.zip |
Update strings in special app access and dev options
- Change all yes/no or on/off strings in special app access to
Allowed/Not allowed
- Remove some dead code in related files
- Add a toast string in DevelopmentSettingsDisabledActivity to prompt
user enable dev options before use.
- Add search in SpecialAccessSettings
Change-Id: I8b2535e037a86e76bdbcd3fb6e1cf2e0347bedbf
Fix: 38290299
Fix: 37469224
Test: make RunSettingsRoboTests
Diffstat (limited to 'src/com/android/settings/applications/DrawOverlayDetails.java')
-rw-r--r-- | src/com/android/settings/applications/DrawOverlayDetails.java | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/src/com/android/settings/applications/DrawOverlayDetails.java b/src/com/android/settings/applications/DrawOverlayDetails.java index 72564bc3f8..c6f3cc0c1e 100644 --- a/src/com/android/settings/applications/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/DrawOverlayDetails.java @@ -20,8 +20,6 @@ import android.app.AppOpsManager; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; @@ -206,33 +204,6 @@ public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenc public static CharSequence getSummary(Context context, OverlayState overlayState) { return context.getString(overlayState.isPermissible() ? - R.string.system_alert_window_on : R.string.system_alert_window_off); - } - - public static CharSequence getSummary(Context context, String pkg) { - // first check if pkg is a system pkg - PackageManager packageManager = context.getPackageManager(); - int uid = -1; - try { - ApplicationInfo appInfo = packageManager.getApplicationInfo(pkg, 0); - uid = appInfo.uid; - if ((appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { - return context.getString(R.string.system_alert_window_on); - } - } catch (PackageManager.NameNotFoundException e) { - // pkg doesn't even exist? - Log.w(LOG_TAG, "Package " + pkg + " not found", e); - return context.getString(R.string.system_alert_window_off); - } - - AppOpsManager appOpsManager = (AppOpsManager) context.getSystemService(Context - .APP_OPS_SERVICE); - if (uid == -1) { - return context.getString(R.string.system_alert_window_off); - } - - int mode = appOpsManager.noteOpNoThrow(AppOpsManager.OP_SYSTEM_ALERT_WINDOW, uid, pkg); - return context.getString((mode == AppOpsManager.MODE_ALLOWED) ? - R.string.system_alert_window_on : R.string.system_alert_window_off); + R.string.app_permission_summary_allowed : R.string.app_permission_summary_not_allowed); } } |