am a112461f: am 610f310b: Merge "New permissions UI." into jb-dev (eabcde2d) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -5783,7 +5783,7 @@ package android.content {
		field public static final java.lang.String CATEGORY_UNIT_TEST = "android.intent.category.UNIT_TEST";
		field public static final android.os.Parcelable.Creator CREATOR;
		field public static final java.lang.String EXTRA_ALARM_COUNT = "android.intent.extra.ALARM_COUNT";
		field public static final java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE";
		field public static final deprecated java.lang.String EXTRA_ALLOW_REPLACE = "android.intent.extra.ALLOW_REPLACE";
		field public static final java.lang.String EXTRA_BCC = "android.intent.extra.BCC";
		field public static final java.lang.String EXTRA_BUG_REPORT = "android.intent.extra.BUG_REPORT";
		field public static final java.lang.String EXTRA_CC = "android.intent.extra.CC";

core/java/android/content/Intent.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1240,7 +1240,11 @@ public class Intent implements Parcelable, Cloneable {
		* Used as a boolean extra field with {@link #ACTION_INSTALL_PACKAGE} to install a
		* package. Tells the installer UI to skip the confirmation with the user
		* if the .apk is replacing an existing one.
		* @deprecated As of {@link android.os.Build.VERSION_CODES#JELLY_BEAN}, Android
		* will no longer show an interstitial message about updating existing
		* applications so this is no longer needed.
		*/
		@Deprecated
		public static final String EXTRA_ALLOW_REPLACE
		= "android.intent.extra.ALLOW_REPLACE";

core/java/android/widget/AppSecurityPermissions.java

+292 −300

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/layout/app_permission_item.xml

+16 −21

Original line number	Diff line number	Diff line
		@@ -19,37 +19,32 @@
		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_alignParentLeft="true"
		android:layout_width="32dp"
		android:layout_height="32dp"
		android:layout_marginLeft="16dp"
		android:layout_marginRight="8dp"
		android:scaleType="fitCenter" />


		<TextView
		android:id="@+id/permission_group"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textStyle="bold"
		android:paddingLeft="6dip"
		android:layout_toRightOf="@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:paddingLeft="6dip"
		android:layout_below="@id/permission_group"
		android:layout_toRightOf="@id/perm_icon"
		android:layout_marginLeft="8dp"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />
		android:layout_height="wrap_content"
		android:layout_gravity="top\|left" />

		</RelativeLayout>
		</view>

core/res/res/layout/app_permission_item_old.xml

0 → 100644

+55 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2008 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.
		-->

		<!--
		Defines the layout of a single permission item.
		Contains the group name and a list of permission labels under the group.
		-->

		<RelativeLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<ImageView
		android:id="@+id/perm_icon"
		android:layout_width="30dip"
		android:layout_height="30dip"
		android:layout_alignParentLeft="true"
		android:scaleType="fitCenter" />


		<TextView
		android:id="@+id/permission_group"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textStyle="bold"
		android:paddingLeft="6dip"
		android:layout_toRightOf="@id/perm_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />

		<TextView
		android:id="@+id/permission_list"
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:layout_marginTop="-4dip"
		android:paddingBottom="8dip"
		android:paddingLeft="6dip"
		android:layout_below="@id/permission_group"
		android:layout_toRightOf="@id/perm_icon"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content" />

		</RelativeLayout>