diff options
author | Svet Ganov <svetoslavganov@google.com> | 2015-12-01 21:08:00 -0800 |
---|---|---|
committer | Svet Ganov <svetoslavganov@google.com> | 2015-12-01 21:08:00 -0800 |
commit | dede951ec7d3d7d15b6d82d87cc4407ab96e6357 (patch) | |
tree | b0a7902cb9714712cd5c444f0d32d4381eff533e | |
parent | bf7316751f0c73b435b693fd20b0c9b2fa973e85 (diff) | |
download | android_packages_apps_PackageInstaller-dede951ec7d3d7d15b6d82d87cc4407ab96e6357.tar.gz android_packages_apps_PackageInstaller-dede951ec7d3d7d15b6d82d87cc4407ab96e6357.tar.bz2 android_packages_apps_PackageInstaller-dede951ec7d3d7d15b6d82d87cc4407ab96e6357.zip |
Add some things missing in the previous CL.
Change-Id: I17ae37d84c0d78bcfcaa848efb17f46c7f7c915a
4 files changed, 29 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> diff --git a/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java index 52a6cbec..91116130 100644 --- a/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/television/AppPermissionsFragment.java @@ -51,6 +51,7 @@ import com.android.packageinstaller.R; import com.android.packageinstaller.permission.model.AppPermissionGroup; import com.android.packageinstaller.permission.model.AppPermissions; import com.android.packageinstaller.permission.ui.OverlayTouchActivity; +import com.android.packageinstaller.permission.ui.ReviewPermissionsActivity; import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.permission.utils.Utils; diff --git a/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java index f286aba0..e2f48182 100644 --- a/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/television/PermissionAppsFragment.java @@ -46,6 +46,7 @@ import com.android.packageinstaller.permission.model.PermissionApps; import com.android.packageinstaller.permission.model.PermissionApps.Callback; import com.android.packageinstaller.permission.model.PermissionApps.PermissionApp; import com.android.packageinstaller.permission.ui.OverlayTouchActivity; +import com.android.packageinstaller.permission.ui.ReviewPermissionsActivity; import com.android.packageinstaller.permission.utils.LocationUtils; import com.android.packageinstaller.permission.utils.SafetyNetLogger; import com.android.packageinstaller.permission.utils.Utils; |