diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-12-02 05:09:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-12-02 05:09:09 +0000 |
| commit | c1f6e3d0eb42fa017db66a6f3a6c8491d6530dcb (patch) | |
| tree | 00699080a69f4cf90ed2a415e5a904c7f80dfbec /res | |
| parent | 0e2a483c8016d45f36cd849465eecb1928054483 (diff) | |
| parent | dede951ec7d3d7d15b6d82d87cc4407ab96e6357 (diff) | |
| download | android_packages_apps_PackageInstaller-c1f6e3d0eb42fa017db66a6f3a6c8491d6530dcb.tar.gz android_packages_apps_PackageInstaller-c1f6e3d0eb42fa017db66a6f3a6c8491d6530dcb.tar.bz2 android_packages_apps_PackageInstaller-c1f6e3d0eb42fa017db66a6f3a6c8491d6530dcb.zip | |
Merge "Add some things missing in the previous CL."
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 3 | ||||
| -rw-r--r-- | res/xml/all_permissions.xml | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index acc22bcb..41b097a9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -171,6 +171,9 @@ <!-- Permissions --> + <!-- Title for the dialog button to allow a permission grant. --> + <string name="grant_dialog_button_allow">Allow</string> + <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_togglePermissions" translatable="false">toggle permissions</string> diff --git a/res/xml/all_permissions.xml b/res/xml/all_permissions.xml new file mode 100644 index 00000000..5f7f847b --- /dev/null +++ b/res/xml/all_permissions.xml @@ -0,0 +1,24 @@ +<?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. +--> + +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/all_permissions"> + + <PreferenceCategory + android:key="other_perms" + android:title="@string/other_permissions" /> + +</PreferenceScreen> |