Merge "New permissions UI, again." into jb-mr1-dev (3e451fa1) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -755,6 +755,7 @@ package android {
		field public static final int pathPrefix = 16842795; // 0x101002b
		field public static final int permission = 16842758; // 0x1010006
		field public static final int permissionGroup = 16842762; // 0x101000a
		field public static final int permissionGroupFlags = 16843714; // 0x10103c2
		field public static final int persistent = 16842765; // 0x101000d
		field public static final int persistentDrawingCache = 16842990; // 0x10100ee
		field public static final deprecated int phoneNumber = 16843111; // 0x1010167
		@@ -6704,8 +6705,11 @@ package android.content.pm {
		method public int describeContents();
		method public java.lang.CharSequence loadDescription(android.content.pm.PackageManager);
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final int FLAG_PERSONAL_INFO = 1; // 0x1
		field public int descriptionRes;
		field public int flags;
		field public java.lang.CharSequence nonLocalizedDescription;
		field public int priority;
		}

		public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {

core/java/android/content/pm/PackageParser.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -1487,7 +1487,8 @@ public class PackageParser {
		perm.info.descriptionRes = sa.getResourceId(
		com.android.internal.R.styleable.AndroidManifestPermissionGroup_description,
		0);
		perm.info.flags = 0;
		perm.info.flags = sa.getInt(
		com.android.internal.R.styleable.AndroidManifestPermissionGroup_permissionGroupFlags, 0);
		perm.info.priority = sa.getInt(
		com.android.internal.R.styleable.AndroidManifestPermissionGroup_priority, 0);
		if (perm.info.priority > 0 && (flags&PARSE_IS_SYSTEM) == 0) {

core/java/android/content/pm/PermissionGroupInfo.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -44,20 +44,17 @@ public class PermissionGroupInfo extends PackageItemInfo implements Parcelable {
		/**
		* Flag for {@link #flags}, corresponding to <code>personalInfo</code>
		* value of {@link android.R.attr#permissionGroupFlags}.
		* @hide
		*/
		public static final int FLAG_PERSONAL_INFO = 1<<0;

		/**
		* Additional flags about this group as given by
		* {@link android.R.attr#permissionGroupFlags}.
		* @hide
		*/
		public int flags;

		/**
		* Prioritization of this group, for visually sorting with other groups.
		* @hide
		*/
		public int priority;

core/java/android/widget/AppSecurityPermissions.java

+441 −279

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/layout/app_permission_item.xml

+17 −21

Original line number	Diff line number	Diff line
		@@ -19,37 +19,33 @@
		Contains the group name and a list of permission labels under the group.
		-->

		<RelativeLayout
		<view class="android.widget.AppSecurityPermissions$PermissionItemView"
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		android:layout_height="wrap_content"
		android:orientation="horizontal"
		android:background="?android:attr/selectableItemBackground">

		<ImageView
		android:id="@+id/perm_icon"
		android:layout_width="30dip"
		android:layout_height="30dip"
		android:layout_alignParentStart="true"
		android:layout_width="32dp"
		android:layout_height="32dp"
		android:layout_marginStart="16dp"
		android:layout_marginEnd="8dp"
		android:scaleType="fitCenter" />


		<TextView
		android:id="@+id/permission_group"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textStyle="bold"
		android:paddingStart="6dip"
		android:layout_toEndOf="@id/perm_icon"
		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />
		android:layout_height="match_parent"
		android:background="?android:attr/dividerVertical" />

		<TextView
		android:id="@+id/permission_list"
		android:id="@+id/perm_name"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:layout_marginTop="-4dip"
		android:paddingBottom="8dip"
		android:paddingStart="6dip"
		android:layout_below="@id/permission_group"
		android:layout_toEndOf="@id/perm_icon"
		android:textSize="16sp"
		android:layout_marginStart="8dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />
		android:layout_height="wrap_content"
		android:layout_gravity="top\|left" />

		</RelativeLayout>
		</view>