From d9f8f576c98b8ef194ca77131cb779b14dde5886 Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Thu, 16 Jul 2015 13:00:36 -0700
Subject: Remove the obsolete 'show legacy' option from permission screens

bug:22523221

Change-Id: I09b605c7689c7402942c02a2639f1f28c7ee0c54
---
 res/menu/toggle_legacy_permissions.xml | 24 ------------------------
 res/values/strings.xml                 |  6 ------
 2 files changed, 30 deletions(-)
 delete mode 100644 res/menu/toggle_legacy_permissions.xml

(limited to 'res')

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>
 
-- 
cgit v1.2.3