diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-07-17 01:03:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 01:03:20 +0000 |
| commit | 8cee73b115d040fc4d4a589f61518f16f740c0d0 (patch) | |
| tree | c5e29f8c9b8c33dc93df27a1af6d6a5fab7d3294 /res | |
| parent | 945d456bb116452d99c97284a3fbb37c4c1ba801 (diff) | |
| parent | 9c952ae1602fd2b8c58d5f54f953a7494efb3bab (diff) | |
| download | android_packages_apps_PackageInstaller-8cee73b115d040fc4d4a589f61518f16f740c0d0.tar.gz android_packages_apps_PackageInstaller-8cee73b115d040fc4d4a589f61518f16f740c0d0.tar.bz2 android_packages_apps_PackageInstaller-8cee73b115d040fc4d4a589f61518f16f740c0d0.zip | |
am 9c952ae1: am 50c7b52d: am 4bb2c78d: Merge "Remove the obsolete \'show legacy\' option from permission screens" into mnc-dev
* commit '9c952ae1602fd2b8c58d5f54f953a7494efb3bab':
Remove the obsolete 'show legacy' option from permission screens
Diffstat (limited to 'res')
| -rw-r--r-- | res/menu/toggle_legacy_permissions.xml | 24 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 |
2 files changed, 0 insertions, 30 deletions
diff --git a/res/menu/toggle_legacy_permissions.xml b/res/menu/toggle_legacy_permissions.xml deleted file mode 100644 index 544c4793..00000000 --- a/res/menu/toggle_legacy_permissions.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2015 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. ---> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/toggle_legacy_permissions" - android:title="@string/show_legacy_permissions"> - </item> - -</menu> diff --git a/res/values/strings.xml b/res/values/strings.xml index 30eda5b0..f0b80e05 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -221,12 +221,6 @@ <!-- Warning for turning off permissions on older apps --> <string name="old_sdk_deny_warning">This app was designed for an older version of Android. Denying permission may cause it to no longer function as intended.</string> - <!-- Label for the menu option to show legacy permissions [CHAR LIMIT=40] --> - <string name="show_legacy_permissions">Show legacy</string> - - <!-- Label for the menu option to hide legacy permissions [CHAR LIMIT=40] --> - <string name="hide_legacy_permissions">Hide legacy</string> - <!-- The default description of a permission, i.e. what it does. [CHAR LIMIT=40] --> <string name="default_permission_description">perform an unknown action</string> |