From ca2c590ba3d6de067c6b5cd820e6ee9319cbfeb7 Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Mon, 29 Jun 2015 09:04:48 -0700
Subject: Remove the empty accounts group and not needed storage resources.

bug:22044480

Change-Id: I76297f5540614301893871b3b41219002076b920
---
 api/current.txt                                         |   1 -
 api/system-current.txt                                  |   1 -
 core/res/AndroidManifest.xml                            |  10 ----------
 core/res/res/drawable-hdpi/perm_group_accounts.png      | Bin 714 -> 0 bytes
 core/res/res/drawable-mdpi/perm_group_accounts.png      | Bin 528 -> 0 bytes
 core/res/res/drawable-xhdpi/perm_group_accounts.png     | Bin 814 -> 0 bytes
 core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png | Bin 1096 -> 0 bytes
 core/res/res/drawable-xxhdpi/ic_perm_group_storage.png  | Bin 1040 -> 0 bytes
 core/res/res/drawable-xxhdpi/perm_group_accounts.png    | Bin 1131 -> 0 bytes
 core/res/res/drawable-xxxhdpi/perm_group_accounts.png   | Bin 1539 -> 0 bytes
 core/res/res/values/strings.xml                         |   5 -----
 11 files changed, 17 deletions(-)
 delete mode 100644 core/res/res/drawable-hdpi/perm_group_accounts.png
 delete mode 100644 core/res/res/drawable-mdpi/perm_group_accounts.png
 delete mode 100644 core/res/res/drawable-xhdpi/perm_group_accounts.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png
 delete mode 100644 core/res/res/drawable-xxhdpi/ic_perm_group_storage.png
 delete mode 100644 core/res/res/drawable-xxhdpi/perm_group_accounts.png
 delete mode 100644 core/res/res/drawable-xxxhdpi/perm_group_accounts.png

diff --git a/api/current.txt b/api/current.txt
index 1f1069521e26..479cabb818c4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -143,7 +143,6 @@ package android {
 
   public static final class Manifest.permission_group {
     ctor public Manifest.permission_group();
-    field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
     field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
     field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
     field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";
diff --git a/api/system-current.txt b/api/system-current.txt
index 459237060780..367537d4059d 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -232,7 +232,6 @@ package android {
 
   public static final class Manifest.permission_group {
     ctor public Manifest.permission_group();
-    field public static final java.lang.String ACCOUNTS = "android.permission-group.ACCOUNTS";
     field public static final java.lang.String CALENDAR = "android.permission-group.CALENDAR";
     field public static final java.lang.String CAMERA = "android.permission-group.CAMERA";
     field public static final java.lang.String CONTACTS = "android.permission-group.CONTACTS";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bada791ef65c..af3b199db1de 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1024,15 +1024,6 @@
     <!-- ================================== -->
     <eat-comment />
 
-    <!-- Permissions for direct access to the accounts managed
-         by the Account Manager. -->
-    <permission-group android:name="android.permission-group.ACCOUNTS"
-        android:label="@string/permgrouplab_accounts"
-        android:icon="@drawable/perm_group_accounts"
-        android:description="@string/permgroupdesc_accounts"
-        android:permissionGroupFlags="personalInfo"
-        android:priority="1000" />
-
     <!-- Allows access to the list of accounts in the Accounts Service.
         <p>Protection level: normal
     -->
@@ -1045,7 +1036,6 @@
     <!-- @SystemApi Allows applications to call into AccountAuthenticators.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.ACCOUNT_MANAGER"
-        android:permissionGroup="android.permission-group.ACCOUNTS"
         android:protectionLevel="signature" />
 
     <!-- ================================== -->
diff --git a/core/res/res/drawable-hdpi/perm_group_accounts.png b/core/res/res/drawable-hdpi/perm_group_accounts.png
deleted file mode 100644
index 5ac28e7c4c24..000000000000
Binary files a/core/res/res/drawable-hdpi/perm_group_accounts.png and /dev/null differ
diff --git a/core/res/res/drawable-mdpi/perm_group_accounts.png b/core/res/res/drawable-mdpi/perm_group_accounts.png
deleted file mode 100644
index ce4e6838ec63..000000000000
Binary files a/core/res/res/drawable-mdpi/perm_group_accounts.png and /dev/null differ
diff --git a/core/res/res/drawable-xhdpi/perm_group_accounts.png b/core/res/res/drawable-xhdpi/perm_group_accounts.png
deleted file mode 100644
index ca622e9886ad..000000000000
Binary files a/core/res/res/drawable-xhdpi/perm_group_accounts.png and /dev/null differ
diff --git a/core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png b/core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png
deleted file mode 100644
index f30fcd4c74ee..000000000000
Binary files a/core/res/res/drawable-xxhdpi/ic_perm_group_accounts.png and /dev/null differ
diff --git a/core/res/res/drawable-xxhdpi/ic_perm_group_storage.png b/core/res/res/drawable-xxhdpi/ic_perm_group_storage.png
deleted file mode 100644
index d3937dbef42e..000000000000
Binary files a/core/res/res/drawable-xxhdpi/ic_perm_group_storage.png and /dev/null differ
diff --git a/core/res/res/drawable-xxhdpi/perm_group_accounts.png b/core/res/res/drawable-xxhdpi/perm_group_accounts.png
deleted file mode 100644
index 2fc3baa02c7a..000000000000
Binary files a/core/res/res/drawable-xxhdpi/perm_group_accounts.png and /dev/null differ
diff --git a/core/res/res/drawable-xxxhdpi/perm_group_accounts.png b/core/res/res/drawable-xxxhdpi/perm_group_accounts.png
deleted file mode 100644
index 1d9db83f4372..000000000000
Binary files a/core/res/res/drawable-xxxhdpi/perm_group_accounts.png and /dev/null differ
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 5288fa3ba6a3..bf6b0151f9d3 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -676,11 +676,6 @@
         Malicious apps may interfere with the performance or operation of your
         device when an emergency cell broadcast is received.</string>
 
-    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
-    <string name="permgrouplab_accounts">Your accounts</string>
-    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
-    <string name="permgroupdesc_accounts">Access the available accounts.</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_subscribedFeedsRead">read subscribed feeds</string>
     <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
-- 
cgit v1.2.3-59-g8ed1b