diff options
Diffstat (limited to 'core')
34 files changed, 637 insertions, 855 deletions
diff --git a/core/java/android/animation/LayoutTransition.java b/core/java/android/animation/LayoutTransition.java index bdcb2af..4d3a519 100644 --- a/core/java/android/animation/LayoutTransition.java +++ b/core/java/android/animation/LayoutTransition.java @@ -831,6 +831,14 @@ public class LayoutTransition { return; } + // Don't animate items up from size(0,0); this is likely because the objects + // were offscreen/invisible or otherwise measured to be infinitely small. We don't + // want to see them animate into their real size; just ignore animation requests + // on these views + if (child.getWidth() == 0 && child.getHeight() == 0) { + return; + } + // Make a copy of the appropriate animation final Animator anim = baseAnimator.clone(); diff --git a/core/java/android/view/ActionProvider.java b/core/java/android/view/ActionProvider.java index ed976ab..9150d19 100644 --- a/core/java/android/view/ActionProvider.java +++ b/core/java/android/view/ActionProvider.java @@ -19,28 +19,25 @@ package android.view; import android.content.Context; /** - * This class is a mediator for accomplishing a given task, for example sharing a file. - * It is responsible for creating a view that performs an action that accomplishes the task. - * This class also implements other functions such a performing a default action. - * <p> - * An ActionProvider can be optionally specified for a {@link MenuItem} and in such a - * case it will be responsible for creating the action view that appears in the - * {@link android.app.ActionBar} as a substitute for the menu item when the item is - * displayed as an action item. Also the provider is responsible for performing a - * default action if a menu item placed on the overflow menu of the ActionBar is - * selected and none of the menu item callbacks has handled the selection. For this - * case the provider can also optionally provide a sub-menu for accomplishing the - * task at hand. - * </p> - * <p> - * There are two ways for using an action provider for creating and handling of action views: + * An ActionProvider defines rich menu interaction in a single component. + * ActionProvider can generate action views for use in the action bar, + * dynamically populate submenus of a MenuItem, and handle default menu + * item invocations. + * + * <p>An ActionProvider can be optionally specified for a {@link MenuItem} and will be + * responsible for creating the action view that appears in the {@link android.app.ActionBar} + * in place of a simple button in the bar. When the menu item is presented in a way that + * does not allow custom action views, (e.g. in an overflow menu,) the ActionProvider + * can perform a default action.</p> + * + * <p>There are two ways to use an action provider: * <ul> * <li> - * Setting the action provider on a {@link MenuItem} directly by calling + * Set the action provider on a {@link MenuItem} directly by calling * {@link MenuItem#setActionProvider(ActionProvider)}. * </li> * <li> - * Declaring the action provider in the menu XML resource. For example: + * Declare the action provider in an XML menu resource. For example: * <pre> * <code> * <item android:id="@+id/my_menu_item" diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index fe812af..5108990 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -74,7 +74,6 @@ class BrowserFrame extends Handler { private final CallbackProxy mCallbackProxy; private final WebSettingsClassic mSettings; private final Context mContext; - private final WebViewDatabaseClassic mDatabase; private final WebViewCore mWebViewCore; /* package */ boolean mLoadInitFromJava; private int mLoadType; @@ -243,7 +242,6 @@ class BrowserFrame extends Handler { mSettings = settings; mContext = context; mCallbackProxy = proxy; - mDatabase = WebViewDatabaseClassic.getInstance(appContext); mWebViewCore = w; mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy); @@ -426,7 +424,8 @@ class BrowserFrame extends Handler { if (h != null) { String url = WebTextView.urlForAutoCompleteData(h.getUrl()); if (url != null) { - mDatabase.setFormData(url, data); + WebViewDatabaseClassic.getInstance(mContext).setFormData( + url, data); } } } @@ -498,8 +497,9 @@ class BrowserFrame extends Handler { if (item != null) { WebAddress uri = new WebAddress(item.getUrl()); String schemePlusHost = uri.getScheme() + uri.getHost(); - String[] up = mDatabase.getUsernamePassword( - schemePlusHost); + String[] up = + WebViewDatabaseClassic.getInstance(mContext) + .getUsernamePassword(schemePlusHost); if (up != null && up[0] != null) { setUsernamePassword(up[0], up[1]); } @@ -800,10 +800,10 @@ class BrowserFrame extends Handler { // the post data (there could be another form on the // page and that was posted instead. String postString = new String(postData); + WebViewDatabaseClassic db = WebViewDatabaseClassic.getInstance(mContext); if (postString.contains(URLEncoder.encode(username)) && postString.contains(URLEncoder.encode(password))) { - String[] saved = mDatabase.getUsernamePassword( - schemePlusHost); + String[] saved = db.getUsernamePassword(schemePlusHost); if (saved != null) { // null username implies that user has chosen not to // save password @@ -811,7 +811,8 @@ class BrowserFrame extends Handler { // non-null username implies that user has // chosen to save password, so update the // recorded password - mDatabase.setUsernamePassword(schemePlusHost, username, password); + db.setUsernamePassword(schemePlusHost, username, + password); } } else { // CallbackProxy will handle creating the resume diff --git a/core/java/android/webkit/WebSyncManager.java b/core/java/android/webkit/WebSyncManager.java index d3ec603..38b5e5c 100644 --- a/core/java/android/webkit/WebSyncManager.java +++ b/core/java/android/webkit/WebSyncManager.java @@ -37,6 +37,9 @@ abstract class WebSyncManager implements Runnable { // handler of the sync thread protected Handler mHandler; // database for the persistent storage + // Note that this remains uninitialised as it is unused. We cannot remove + // the member as it leaked into the public API via CookieSyncManager. + // TODO: hide this member, ditto for mHandler. protected WebViewDatabase mDataBase; // Ref count for calls to start/stop sync private int mStartSyncRefCount; @@ -62,7 +65,6 @@ abstract class WebSyncManager implements Runnable { protected WebSyncManager(Context context, String name) { mThreadName = name; if (context != null) { - mDataBase = WebViewDatabase.getInstance(context); mSyncThread = new Thread(this); mSyncThread.setName(mThreadName); mSyncThread.start(); diff --git a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java index b2c3091..89dbd1b 100644 --- a/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java +++ b/core/java/com/android/internal/widget/multiwaveview/MultiWaveView.java @@ -23,12 +23,16 @@ import android.animation.ObjectAnimator; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; +import android.content.ComponentName; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.RectF; import android.graphics.drawable.Drawable; +import android.os.Bundle; import android.os.Vibrator; import android.text.TextUtils; import android.util.AttributeSet; @@ -1233,4 +1237,62 @@ public class MultiWaveView extends View { } return -1; } + + private boolean replaceTargetDrawables(Resources res, int existingResourceId, + int newResourceId) { + if (existingResourceId == 0 || newResourceId == 0) { + return false; + } + + boolean result = false; + final ArrayList<TargetDrawable> drawables = mTargetDrawables; + final int size = drawables.size(); + for (int i = 0; i < size; i++) { + final TargetDrawable target = drawables.get(i); + if (target != null && target.getResourceId() == existingResourceId) { + target.setDrawable(res, newResourceId); + result = true; + } + } + + if (result) { + requestLayout(); // in case any given drawable's size changes + } + + return result; + } + + /** + * Searches the given package for a resource to use to replace the Drawable on the + * target with the given resource id + * @param component of the .apk that contains the resource + * @param name of the metadata in the .apk + * @param existingResId the resource id of the target to search for + * @return true if found in the given package and replaced at least one target Drawables + */ + public boolean replaceTargetDrawablesIfPresent(ComponentName component, String name, + int existingResId) { + if (existingResId == 0) return false; + + try { + PackageManager packageManager = mContext.getPackageManager(); + // Look for the search icon specified in the activity meta-data + Bundle metaData = packageManager.getActivityInfo( + component, PackageManager.GET_META_DATA).metaData; + if (metaData != null) { + int iconResId = metaData.getInt(name); + if (iconResId != 0) { + Resources res = packageManager.getResourcesForActivity(component); + return replaceTargetDrawables(res, existingResId, iconResId); + } + } + } catch (NameNotFoundException e) { + Log.w(TAG, "Failed to swap drawable; " + + component.flattenToShortString() + " not found", e); + } catch (Resources.NotFoundException nfe) { + Log.w(TAG, "Failed to swap drawable from " + + component.flattenToShortString(), nfe); + } + return false; + } } diff --git a/core/java/com/android/internal/widget/multiwaveview/TargetDrawable.java b/core/java/com/android/internal/widget/multiwaveview/TargetDrawable.java index 6392093..30f5f2f 100644 --- a/core/java/com/android/internal/widget/multiwaveview/TargetDrawable.java +++ b/core/java/com/android/internal/widget/multiwaveview/TargetDrawable.java @@ -44,7 +44,7 @@ public class TargetDrawable { private float mAlpha = 1.0f; private Drawable mDrawable; private boolean mEnabled = true; - private int mResourceId; + private final int mResourceId; /* package */ static class DrawableWithAlpha extends Drawable { private float mAlpha = 1.0f; @@ -78,6 +78,12 @@ public class TargetDrawable { public TargetDrawable(Resources res, int resId) { mResourceId = resId; + setDrawable(res, resId); + } + + public void setDrawable(Resources res, int resId) { + // Note we explicitly don't set mResourceId to resId since we allow the drawable to be + // swapped at runtime and want to re-use the existing resource id for identification. Drawable drawable = resId == 0 ? null : res.getDrawable(resId); // Mutate the drawable so we can animate shared drawable properties. mDrawable = drawable != null ? drawable.mutate() : null; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 155e59c..d9d87c1 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -139,30 +139,17 @@ <eat-comment /> <!-- Used for permissions that can be used to make the user spend money - without their direct involvement. --> + without their direct involvement. For example, this is the group + for permissions that allow you to directly place phone calls, + directly send SMS messages, etc. --> <permission-group android:name="android.permission-group.COST_MONEY" android:label="@string/permgrouplab_costMoney" android:description="@string/permgroupdesc_costMoney" /> - <!-- ================================== --> - <!-- Permissions for accessing messages --> - <!-- ================================== --> - <eat-comment /> - <!-- Used for permissions that allow an application to send messages - on behalf of the user or intercept messages being received by the - user. This is primarily intended for SMS/MMS messaging, such as - receiving or reading an MMS. --> - <permission-group android:name="android.permission-group.MESSAGES" - android:label="@string/permgrouplab_messages" - android:icon="@drawable/perm_group_messages" - android:description="@string/permgroupdesc_messages" - android:permissionGroupFlags="personalInfo" - android:priority="360"/> - - <!-- Allows an application to send SMS messages. --> + <!-- Allows an application to send SMS messages. --> <permission android:name="android.permission.SEND_SMS" - android:permissionGroup="android.permission-group.MESSAGES" + android:permissionGroup="android.permission-group.COST_MONEY" android:protectionLevel="dangerous" android:label="@string/permlab_sendSms" android:description="@string/permdesc_sendSms" /> @@ -171,11 +158,33 @@ input or confirmation. @hide --> <permission android:name="android.permission.SEND_SMS_NO_CONFIRMATION" - android:permissionGroup="android.permission-group.MESSAGES" + android:permissionGroup="android.permission-group.COST_MONEY" android:protectionLevel="signature|system" android:label="@string/permlab_sendSmsNoConfirmation" android:description="@string/permdesc_sendSmsNoConfirmation" /> + <!-- Allows an application to initiate a phone call without going through + the Dialer user interface for the user to confirm the call + being placed. --> + <permission android:name="android.permission.CALL_PHONE" + android:permissionGroup="android.permission-group.COST_MONEY" + android:protectionLevel="dangerous" + android:label="@string/permlab_callPhone" + android:description="@string/permdesc_callPhone" /> + + <!-- ================================== --> + <!-- Permissions for accessing messages --> + <!-- ================================== --> + <eat-comment /> + + <!-- Used for permissions that allow an application to send messages + on behalf of the user or intercept messages being received by the + user. This is primarily intended for SMS/MMS messaging, such as + receiving or reading an MMS. --> + <permission-group android:name="android.permission-group.MESSAGES" + android:label="@string/permgrouplab_messages" + android:description="@string/permgroupdesc_messages" /> + <!-- Allows an application to monitor incoming SMS messages, to record or perform processing on them. --> <permission android:name="android.permission.RECEIVE_SMS" @@ -240,25 +249,22 @@ android:description="@string/permdesc_receiveWapPush" /> <!-- =============================================================== --> - <!-- Permissions for accessing social info (contacts and social) --> + <!-- Permissions for accessing personal info (contacts and calendar) --> <!-- =============================================================== --> <eat-comment /> - <!-- Used for permissions that provide access to the user's social connections, - such as contacts, call logs, social stream, etc. This includes + <!-- Used for permissions that provide access to the user's private data, + such as contacts, calendar events, e-mail messages, etc. This includes both reading and writing of this data (which should generally be expressed as two distinct permissions). --> - <permission-group android:name="android.permission-group.SOCIAL_INFO" - android:label="@string/permgrouplab_socialInfo" - android:icon="@drawable/perm_group_social_info" - android:description="@string/permgroupdesc_socialInfo" - android:permissionGroupFlags="personalInfo" - android:priority="320" /> + <permission-group android:name="android.permission-group.PERSONAL_INFO" + android:label="@string/permgrouplab_personalInfo" + android:description="@string/permgroupdesc_personalInfo" /> <!-- Allows an application to read the user's contacts data. --> <permission android:name="android.permission.READ_CONTACTS" - android:permissionGroup="android.permission-group.SOCIAL_INFO" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:protectionLevel="dangerous" android:label="@string/permlab_readContacts" android:description="@string/permdesc_readContacts" /> @@ -266,14 +272,14 @@ <!-- Allows an application to write (but not read) the user's contacts data. --> <permission android:name="android.permission.WRITE_CONTACTS" - android:permissionGroup="android.permission-group.SOCIAL_INFO" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:protectionLevel="dangerous" android:label="@string/permlab_writeContacts" android:description="@string/permdesc_writeContacts" /> <!-- Allows an application to read the user's call log. --> <permission android:name="android.permission.READ_CALL_LOG" - android:permissionGroup="android.permission-group.SOCIAL_INFO" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:protectionLevel="dangerous" android:label="@string/permlab_readCallLog" android:description="@string/permdesc_readCallLog" /> @@ -281,42 +287,11 @@ <!-- Allows an application to write (but not read) the user's contacts data. --> <permission android:name="android.permission.WRITE_CALL_LOG" - android:permissionGroup="android.permission-group.SOCIAL_INFO" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:protectionLevel="dangerous" android:label="@string/permlab_writeCallLog" android:description="@string/permdesc_writeCallLog" /> - <!-- Allows an application to read from the user's social stream. --> - <permission android:name="android.permission.READ_SOCIAL_STREAM" - android:permissionGroup="android.permission-group.SOCIAL_INFO" - android:protectionLevel="dangerous" - android:label="@string/permlab_readSocialStream" - android:description="@string/permdesc_readSocialStream" /> - - <!-- Allows an application to write (but not read) the user's - social stream data. --> - <permission android:name="android.permission.WRITE_SOCIAL_STREAM" - android:permissionGroup="android.permission-group.SOCIAL_INFO" - android:protectionLevel="dangerous" - android:label="@string/permlab_writeSocialStream" - android:description="@string/permdesc_writeSocialStream" /> - - <!-- =============================================================== --> - <!-- Permissions for accessing information about the device owner --> - <!-- =============================================================== --> - <eat-comment /> - - <!-- Used for permissions that provide access to information about the device - user such as profile information. This includes both reading and - writing of this data (which should generally be expressed as two - distinct permissions). --> - <permission-group android:name="android.permission-group.PERSONAL_INFO" - android:label="@string/permgrouplab_personalInfo" - android:icon="@drawable/perm_group_personal_info" - android:description="@string/permgroupdesc_personalInfo" - android:permissionGroupFlags="personalInfo" - android:priority="310" /> - <!-- Allows an application to read the user's personal profile data. --> <permission android:name="android.permission.READ_PROFILE" android:permissionGroup="android.permission-group.PERSONAL_INFO" @@ -332,19 +307,20 @@ android:label="@string/permlab_writeProfile" android:description="@string/permdesc_writeProfile" /> - <!-- =============================================================== --> - <!-- Permissions for accessing the device calendar --> - <!-- =============================================================== --> - <eat-comment /> + <!-- Allows an application to read from the user's social stream. --> + <permission android:name="android.permission.READ_SOCIAL_STREAM" + android:permissionGroup="android.permission-group.PERSONAL_INFO" + android:protectionLevel="dangerous" + android:label="@string/permlab_readSocialStream" + android:description="@string/permdesc_readSocialStream" /> - <!-- Used for permissions that provide access to the device - calendar to create / view events.--> - <permission-group android:name="android.permission-group.CALENDAR" - android:label="@string/permgrouplab_calendar" - android:icon="@drawable/perm_group_calendar" - android:description="@string/permgroupdesc_calendar" - android:permissionGroupFlags="personalInfo" - android:priority="290" /> + <!-- Allows an application to write (but not read) the user's + social stream data. --> + <permission android:name="android.permission.WRITE_SOCIAL_STREAM" + android:permissionGroup="android.permission-group.PERSONAL_INFO" + android:protectionLevel="dangerous" + android:label="@string/permlab_writeSocialStream" + android:description="@string/permdesc_writeSocialStream" /> <!-- Allows an application to read the user's calendar data. --> <permission android:name="android.permission.READ_CALENDAR" @@ -361,63 +337,26 @@ android:label="@string/permlab_writeCalendar" android:description="@string/permdesc_writeCalendar" /> - <!-- =============================================================== --> - <!-- Permissions for accessing the user dictionary--> - <!-- =============================================================== --> - <eat-comment /> - - <!-- Used for permissions that provide access to the user - calendar to create / view events.--> - <permission-group android:name="android.permission-group.USER_DICTIONARY" - android:label="@string/permgrouplab_dictionary" - android:icon="@drawable/perm_group_user_dictionary" - android:description="@string/permgroupdesc_dictionary" - android:permissionGroupFlags="personalInfo" - android:priority="170" /> - <!-- Allows an application to read the user dictionary. This should really only be required by an IME, or a dictionary editor like the Settings app. --> <permission android:name="android.permission.READ_USER_DICTIONARY" - android:permissionGroup="android.permission-group.USER_DICTIONARY" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:protectionLevel="dangerous" android:label="@string/permlab_readDictionary" android:description="@string/permdesc_readDictionary" /> - <!-- Used for permissions that provide access to the user - calendar to create / view events.--> - <permission-group android:name="android.permission-group.WRITE_USER_DICTIONARY" - android:label="@string/permgrouplab_writeDictionary" - android:icon="@drawable/perm_group_user_dictionary_write" - android:description="@string/permgroupdesc_writeDictionary" - android:permissionGroupFlags="personalInfo" - android:priority="160" /> - <!-- Allows an application to write to the user dictionary. --> <permission android:name="android.permission.WRITE_USER_DICTIONARY" - android:permissionGroup="android.permission-group.WRITE_USER_DICTIONARY" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:protectionLevel="normal" android:label="@string/permlab_writeDictionary" android:description="@string/permdesc_writeDictionary" /> - <!-- =============================================================== --> - <!-- Permissions for accessing the user bookmarks --> - <!-- =============================================================== --> - <eat-comment /> - - <!-- Used for permissions that provide access to the user - bookmarks and browser history.--> - <permission-group android:name="android.permission-group.BOOKMARKS" - android:label="@string/permgrouplab_bookmarks" - android:icon="@drawable/perm_group_bookmarks" - android:description="@string/permgroupdesc_bookmarks" - android:permissionGroupFlags="personalInfo" - android:priority="300" /> - <!-- Allows an application to read (but not write) the user's browsing history and bookmarks. --> <permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" - android:permissionGroup="android.permission-group.BOOKMARKS" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:label="@string/permlab_readHistoryBookmarks" android:description="@string/permdesc_readHistoryBookmarks" android:protectionLevel="dangerous" /> @@ -425,48 +364,23 @@ <!-- Allows an application to write (but not read) the user's browsing history and bookmarks. --> <permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" - android:permissionGroup="android.permission-group.BOOKMARKS" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:label="@string/permlab_writeHistoryBookmarks" android:description="@string/permdesc_writeHistoryBookmarks" android:protectionLevel="dangerous" /> - <!-- =============================================================== --> - <!-- Permissions for setting the device alarm --> - <!-- =============================================================== --> - <eat-comment /> - - <!-- Used for permissions that provide access to the user voicemail box. --> - <permission-group android:name="android.permission-group.DEVICE_ALARMS" - android:label="@string/permgrouplab_deviceAlarms" - android:icon="@drawable/perm_group_device_alarms" - android:description="@string/permgroupdesc_deviceAlarms" - android:permissionGroupFlags="personalInfo" - android:priority="210" /> - <!-- Allows an application to broadcast an Intent to set an alarm for the user. --> <permission android:name="com.android.alarm.permission.SET_ALARM" - android:permissionGroup="android.permission-group.DEVICE_ALARMS" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:label="@string/permlab_setAlarm" android:description="@string/permdesc_setAlarm" android:protectionLevel="normal" /> - <!-- =============================================================== --> - <!-- Permissions for accessing the user voicemail --> - <!-- =============================================================== --> - <eat-comment /> - - <!-- Used for permissions that provide access to the user voicemail box. --> - <permission-group android:name="android.permission-group.VOICEMAIL" - android:label="@string/permgrouplab_voicemail" - android:icon="@drawable/perm_group_voicemail" - android:description="@string/permgroupdesc_voicemail" - android:permissionGroupFlags="personalInfo" - android:priority="280" /> <!-- Allows an application to add voicemails into the system. --> <permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" - android:permissionGroup="android.permission-group.VOICEMAIL" + android:permissionGroup="android.permission-group.PERSONAL_INFO" android:protectionLevel="dangerous" android:label="@string/permlab_addVoicemail" android:description="@string/permdesc_addVoicemail" /> @@ -481,9 +395,7 @@ <permission-group android:name="android.permission-group.LOCATION" android:label="@string/permgrouplab_location" android:icon="@drawable/perm_group_location" - android:description="@string/permgroupdesc_location" - android:permissionGroupFlags="personalInfo" - android:priority="330" /> + android:description="@string/permgroupdesc_location" /> <!-- Allows an application to access fine (e.g., GPS) location --> <permission android:name="android.permission.ACCESS_FINE_LOCATION" @@ -530,9 +442,7 @@ or other related network operations. --> <permission-group android:name="android.permission-group.NETWORK" android:label="@string/permgrouplab_network" - android:icon="@drawable/perm_group_network" - android:description="@string/permgroupdesc_network" - android:priority="270" /> + android:description="@string/permgroupdesc_network" /> <!-- Allows applications to open network sockets. --> <permission android:name="android.permission.INTERNET" @@ -554,13 +464,6 @@ android:protectionLevel="normal" android:description="@string/permdesc_accessWifiState" android:label="@string/permlab_accessWifiState" /> - - <!-- Allows applications to change Wi-Fi connectivity state --> - <permission android:name="android.permission.CHANGE_WIFI_STATE" - android:permissionGroup="android.permission-group.NETWORK" - android:protectionLevel="normal" - android:description="@string/permdesc_changeWifiState" - android:label="@string/permlab_changeWifiState" /> <!-- @hide --> <permission android:name="android.permission.ACCESS_WIMAX_STATE" @@ -569,55 +472,35 @@ android:description="@string/permdesc_accessWimaxState" android:label="@string/permlab_accessWimaxState" /> - <!-- @hide --> - <permission android:name="android.permission.CHANGE_WIMAX_STATE" - android:permissionGroup="android.permission-group.NETWORK" - android:protectionLevel="dangerous" - android:description="@string/permdesc_changeWimaxState" - android:label="@string/permlab_changeWimaxState" /> - - <!-- ======================================= --> - <!-- Permissions for short range, peripheral networks --> - <!-- ======================================= --> - <eat-comment /> - - <!-- Used for permissions that provide access to other devices through Bluetooth.--> - <permission-group android:name="android.permission-group.BLUETOOTH_NETWORK" - android:label="@string/permgrouplab_bluetoothNetwork" - android:icon="@drawable/perm_group_bluetooth" - android:description="@string/permgroupdesc_bluetoothNetwork" - android:priority="260" /> - - <!-- Allows applications to connect to paired bluetooth devices --> + <!-- Allows applications to connect to paired bluetooth devices --> <permission android:name="android.permission.BLUETOOTH" - android:permissionGroup="android.permission-group.BLUETOOTH_NETWORK" + android:permissionGroup="android.permission-group.NETWORK" android:protectionLevel="dangerous" android:description="@string/permdesc_bluetooth" android:label="@string/permlab_bluetooth" /> - - <!-- Allows applications to discover and pair bluetooth devices --> - <permission android:name="android.permission.BLUETOOTH_ADMIN" - android:permissionGroup="android.permission-group.BLUETOOTH_NETWORK" - android:protectionLevel="dangerous" - android:description="@string/permdesc_bluetoothAdmin" - android:label="@string/permlab_bluetoothAdmin" /> - - <!-- Used for permissions that provide access to network services that - are for peripherals and other nearby devices. These networks - generally do not provide IP based networking or internet access.--> - <permission-group android:name="android.permission-group.SHORTRANGE_NETWORK" - android:label="@string/permgrouplab_shortrangeNetwork" - android:icon="@drawable/perm_group_shortrange_network" - android:description="@string/permgroupdesc_shortrangeNetwork" - android:priority="250" /> <!-- Allows applications to perform I/O operations over NFC --> <permission android:name="android.permission.NFC" - android:permissionGroup="android.permission-group.SHORTRANGE_NETWORK" + android:permissionGroup="android.permission-group.NETWORK" android:protectionLevel="dangerous" android:description="@string/permdesc_nfc" android:label="@string/permlab_nfc" /> + <!-- Allows an application to use SIP service --> + <permission android:name="android.permission.USE_SIP" + android:permissionGroup="android.permission-group.NETWORK" + android:protectionLevel="dangerous" + android:description="@string/permdesc_use_sip" + android:label="@string/permlab_use_sip" /> + + <!-- Allows applications to call into AccountAuthenticators. Only + the system can get this permission. --> + <permission android:name="android.permission.ACCOUNT_MANAGER" + android:permissionGroup="android.permission-group.ACCOUNTS" + android:protectionLevel="signature" + android:description="@string/permdesc_accountManagerService" + android:label="@string/permlab_accountManagerService" /> + <!-- Allows an internal user to use privileged ConnectivityManager APIs. @hide --> @@ -634,10 +517,7 @@ 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="200" /> + android:description="@string/permgroupdesc_accounts" /> <!-- Allows access to the list of accounts in the Accounts Service --> <permission android:name="android.permission.GET_ACCOUNTS" @@ -668,89 +548,59 @@ android:label="@string/permlab_manageAccounts" android:description="@string/permdesc_manageAccounts" /> - <!-- Allows applications to call into AccountAuthenticators. Only - the system can get this permission. --> - <permission android:name="android.permission.ACCOUNT_MANAGER" - android:permissionGroup="android.permission-group.ACCOUNTS" - android:protectionLevel="signature" - android:description="@string/permdesc_accountManagerService" - android:label="@string/permlab_accountManagerService" /> - <!-- ================================== --> - <!-- Permissions for accessing hardware that may effect battery life--> + <!-- Permissions for accessing hardware --> <!-- ================================== --> <eat-comment /> <!-- Used for permissions that provide direct access to the hardware on - the device that has an effect on battery life. This includes vibrator, - flashlight, etc. --> + the device. This includes audio, the camera, vibrator, etc. --> + <permission-group android:name="android.permission-group.HARDWARE_CONTROLS" + android:label="@string/permgrouplab_hardwareControls" + android:description="@string/permgroupdesc_hardwareControls" /> - <permission-group android:name="android.permission-group.AFFECTS_BATTERY" - android:label="@string/permgrouplab_affectsBattery" - android:icon="@drawable/perm_group_affects_battery" - android:description="@string/permgroupdesc_affectsBattery" - android:priority="180" /> - <!-- Allows applications to enter Wi-Fi Multicast mode --> - <permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" - android:permissionGroup="android.permission-group.AFFECTS_BATTERY" - android:protectionLevel="normal" - android:description="@string/permdesc_changeWifiMulticastState" - android:label="@string/permlab_changeWifiMulticastState" /> + <!-- Allows an application to modify global audio settings --> + <permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" + android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" + android:protectionLevel="dangerous" + android:label="@string/permlab_modifyAudioSettings" + android:description="@string/permdesc_modifyAudioSettings" /> + + <!-- Allows an application to record audio --> + <permission android:name="android.permission.RECORD_AUDIO" + android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" + android:protectionLevel="dangerous" + android:label="@string/permlab_recordAudio" + android:description="@string/permdesc_recordAudio" /> + + <!-- Required to be able to access the camera device. + <p>This will automatically enforce the <a + href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code + <uses-feature>}</a> manifest element for <em>all</em> camera features. + If you do not require all camera features or can properly operate if a camera + is not available, then you must modify your manifest as appropriate in order to + install on devices that don't support all camera features.</p> --> + <permission android:name="android.permission.CAMERA" + android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" + android:protectionLevel="dangerous" + android:label="@string/permlab_camera" + android:description="@string/permdesc_camera" /> <!-- Allows access to the vibrator --> <permission android:name="android.permission.VIBRATE" - android:permissionGroup="android.permission-group.AFFECTS_BATTERY" + android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" android:protectionLevel="normal" android:label="@string/permlab_vibrate" android:description="@string/permdesc_vibrate" /> <!-- Allows access to the flashlight --> <permission android:name="android.permission.FLASHLIGHT" - android:permissionGroup="android.permission-group.AFFECTS_BATTERY" + android:permissionGroup="android.permission-group.HARDWARE_CONTROLS" android:protectionLevel="normal" android:label="@string/permlab_flashlight" android:description="@string/permdesc_flashlight" /> - <!-- Allows using PowerManager WakeLocks to keep processor from sleeping or screen - from dimming --> - <permission android:name="android.permission.WAKE_LOCK" - android:permissionGroup="android.permission-group.AFFECTS_BATTERY" - android:protectionLevel="normal" - android:label="@string/permlab_wakeLock" - android:description="@string/permdesc_wakeLock" /> - - <!-- ==================================================== --> - <!-- Permissions related to changing audio settings --> - <!-- ==================================================== --> - - <!-- Used for permissions that provide direct access to speaker settings - the device. --> - <permission-group android:name="android.permission-group.AUDIO_SETTINGS" - android:label="@string/permgrouplab_audioSettings" - android:icon="@drawable/perm_group_audio_settings" - android:description="@string/permgroupdesc_audioSettings" - android:priority="130" /> - - <!-- Allows an application to modify global audio settings --> - <permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" - android:permissionGroup="android.permission-group.AUDIO_SETTINGS" - android:protectionLevel="normal" - android:label="@string/permlab_modifyAudioSettings" - android:description="@string/permdesc_modifyAudioSettings" /> - - <!-- ================================== --> - <!-- Permissions for accessing hardware --> - <!-- ================================== --> - <eat-comment /> - - <!-- Used for permissions that provide direct access to the hardware on - the device. This includes audio, the camera, vibrator, etc. --> - <permission-group android:name="android.permission-group.HARDWARE_CONTROLS" - android:label="@string/permgrouplab_hardwareControls" - android:description="@string/permgroupdesc_hardwareControls" - android:priority="260"/> - <!-- Allows an application to manage preferences and permissions for USB devices @hide --> <permission android:name="android.permission.MANAGE_USB" @@ -786,54 +636,11 @@ android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signature" /> - <!-- =========================================== --> - <!-- Permissions associated with audio capture --> - <!-- =========================================== --> - <eat-comment /> - - <!-- Used for permissions that are associated with accessing - microphone audio from the device. Note that phone calls also capture audio - but are in a separate (more visible) permission group. --> - <permission-group android:name="android.permission-group.MICROPHONE" - android:label="@string/permgrouplab_microphone" - android:icon="@drawable/perm_group_microphone" - android:description="@string/permgroupdesc_microphone" - android:permissionGroupFlags="personalInfo" - android:priority="340" /> - - <!-- Allows an application to record audio --> - <permission android:name="android.permission.RECORD_AUDIO" - android:permissionGroup="android.permission-group.MICROPHONE" - android:protectionLevel="dangerous" - android:label="@string/permlab_recordAudio" /> - - - <!-- =========================================== --> - <!-- Permissions associated with camera and image capture --> - <!-- =========================================== --> - <eat-comment /> - - <!-- Used for permissions that are associated with accessing - camera or capturing images/video from the device. --> - <permission-group android:name="android.permission-group.CAMERA" - android:label="@string/permgrouplab_camera" - android:icon="@drawable/perm_group_camera" - android:description="@string/permgroupdesc_camera" - android:permissionGroupFlags="personalInfo" - android:priority="350" /> - - <!-- Required to be able to access the camera device. - <p>This will automatically enforce the <a - href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code - <uses-feature>}</a> manifest element for <em>all</em> camera features. - If you do not require all camera features or can properly operate if a camera - is not available, then you must modify your manifest as appropriate in order to - install on devices that don't support all camera features.</p> --> - <permission android:name="android.permission.CAMERA" - android:permissionGroup="android.permission-group.CAMERA" - android:protectionLevel="dangerous" - android:label="@string/permlab_camera" - android:description="@string/permdesc_camera" /> + <!-- Allows an application to route media output to other devices. --> + <permission android:name="android.permission.ROUTE_MEDIA_OUTPUT" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:label="@string/permlab_route_media_output" + android:description="@string/permdesc_route_media_output" /> <!-- =========================================== --> <!-- Permissions associated with telephony state --> @@ -841,14 +648,13 @@ <eat-comment /> <!-- Used for permissions that are associated with accessing and modifyign - telephony state: placing calls, intercepting outgoing calls, reading - and modifying the phone state. --> + telephony state: intercepting outgoing calls, reading + and modifying the phone state. Note that + placing phone calls is not in this group, since that is in the + more important "takin' yer moneys" group. --> <permission-group android:name="android.permission-group.PHONE_CALLS" android:label="@string/permgrouplab_phoneCalls" - android:icon="@drawable/perm_group_phone_calls" - android:description="@string/permgroupdesc_phoneCalls" - android:permissionGroupFlags="personalInfo" - android:priority="370" /> + android:description="@string/permgroupdesc_phoneCalls" /> <!-- Allows an application to monitor, modify, or abort outgoing calls. --> @@ -879,22 +685,6 @@ android:permissionGroup="android.permission-group.PHONE_CALLS" android:protectionLevel="signature|system" /> - <!-- Allows an application to initiate a phone call without going through - the Dialer user interface for the user to confirm the call - being placed. --> - <permission android:name="android.permission.CALL_PHONE" - android:permissionGroup="android.permission-group.PHONE_CALLS" - android:protectionLevel="dangerous" - android:label="@string/permlab_callPhone" - android:description="@string/permdesc_callPhone" /> - - <!-- Allows an application to use SIP service --> - <permission android:name="android.permission.USE_SIP" - android:permissionGroup="android.permission-group.PHONE_CALLS" - android:protectionLevel="dangerous" - android:description="@string/permdesc_use_sip" - android:label="@string/permlab_use_sip" /> - <!-- ================================== --> <!-- Permissions for sdcard interaction --> <!-- ================================== --> @@ -903,17 +693,14 @@ <!-- Group of permissions that are related to SD card access. --> <permission-group android:name="android.permission-group.STORAGE" android:label="@string/permgrouplab_storage" - android:icon="@drawable/perm_group_storage" - android:description="@string/permgroupdesc_storage" - android:permissionGroupFlags="personalInfo" - android:priority="240" /> + android:description="@string/permgroupdesc_storage" /> <!-- Allows an application to read from external storage --> <permission android:name="android.permission.READ_EXTERNAL_STORAGE" - android:permissionGroup="android.permission-group.STORAGE" + android:permissionGroup="android.permission-group.DEVELOPMENT_TOOLS" android:label="@string/permlab_sdcardRead" android:description="@string/permdesc_sdcardRead" - android:protectionLevel="dangerous" /> + android:protectionLevel="normal" /> <!-- Allows an application to write to external storage --> <permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" @@ -930,44 +717,45 @@ android:description="@string/permdesc_mediaStorageWrite" android:protectionLevel="signature|system" /> - <!-- ================================== --> - <!-- Permissions for screenlock --> - <!-- ================================== --> + <!-- ============================================ --> + <!-- Permissions for low-level system interaction --> + <!-- ============================================ --> <eat-comment /> - <!-- Group of permissions that are related to the screenlock. --> - <permission-group android:name="android.permission-group.SCREENLOCK" - android:label="@string/permgrouplab_storage" - android:icon="@drawable/perm_group_screenlock" - android:permissionGroupFlags="personalInfo" - android:description="@string/permgroupdesc_storage" - android:priority="230" /> + <!-- Group of permissions that are related to system APIs. Many + of these are not permissions the user will be expected to understand, + and such permissions should generally be marked as "normal" protection + level so they don't get displayed. This can also, however, be used + for miscellaneous features that provide access to the operating system, + such as writing the global system settings. --> + <permission-group android:name="android.permission-group.SYSTEM_TOOLS" + android:label="@string/permgrouplab_systemTools" + android:description="@string/permgroupdesc_systemTools" /> - <!-- Allows applications to disable the keyguard --> - <permission android:name="android.permission.DISABLE_KEYGUARD" - android:permissionGroup="android.permission-group.SCREENLOCK" + <!-- Allows an application to read or write the system settings. --> + <permission android:name="android.permission.WRITE_SETTINGS" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="dangerous" - android:description="@string/permdesc_disableKeyguard" - android:label="@string/permlab_disableKeyguard" /> + android:label="@string/permlab_writeSettings" + android:description="@string/permdesc_writeSettings" /> - <!-- ================================== --> - <!-- Permissions to access other installed applications --> - <!-- ================================== --> - <eat-comment /> + <!-- Allows an application to modify the Google service map. --> + <permission android:name="android.permission.WRITE_GSERVICES" + android:protectionLevel="signature|system" + android:label="@string/permlab_writeGservices" + android:description="@string/permdesc_writeGservices" /> - <!-- Group of permissions that are related to the other applications - installed on the system. Examples include such as listing - running apps, or killing background processes. --> - <permission-group android:name="android.permission-group.APP_INFO" - android:label="@string/permgrouplab_appInfo" - android:icon="@drawable/perm_group_app_info" - android:description="@string/permgroupdesc_appInfo" - android:priority="220" /> + <!-- Allows an application to expand or collapse the status bar. --> + <permission android:name="android.permission.EXPAND_STATUS_BAR" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="normal" + android:label="@string/permlab_expandStatusBar" + android:description="@string/permdesc_expandStatusBar" /> <!-- Allows an application to get information about the currently or recently running tasks. --> <permission android:name="android.permission.GET_TASKS" - android:permissionGroup="android.permission-group.APP_INFO" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="dangerous" android:label="@string/permlab_getTasks" android:description="@string/permdesc_getTasks" /> @@ -983,14 +771,14 @@ <!-- Allows an application to change the Z-order of tasks --> <permission android:name="android.permission.REORDER_TASKS" - android:permissionGroup="android.permission-group.APP_INFO" - android:protectionLevel="normal" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" android:label="@string/permlab_reorderTasks" android:description="@string/permdesc_reorderTasks" /> <!-- @hide Allows an application to change to remove/kill tasks --> <permission android:name="android.permission.REMOVE_TASKS" - android:permissionGroup="android.permission-group.APP_INFO" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="signature" android:label="@string/permlab_removeTasks" android:description="@string/permdesc_removeTasks" /> @@ -1003,167 +791,6 @@ android:label="@string/permlab_startAnyActivity" android:description="@string/permdesc_startAnyActivity" /> - <!-- @deprecated The {@link android.app.ActivityManager#restartPackage} - API is no longer supported. --> - <permission android:name="android.permission.RESTART_PACKAGES" - android:permissionGroup="android.permission-group.APP_INFO" - android:protectionLevel="normal" - android:label="@string/permlab_killBackgroundProcesses" - android:description="@string/permdesc_killBackgroundProcesses" /> - - <!-- Allows an application to call - {@link android.app.ActivityManager#killBackgroundProcesses}. --> - <permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" - android:permissionGroup="android.permission-group.APP_INFO" - android:protectionLevel="normal" - android:label="@string/permlab_killBackgroundProcesses" - android:description="@string/permdesc_killBackgroundProcesses" /> - - <!-- ================================== --> - <!-- Permissions affecting the display of other applications --> - <!-- ================================== --> - <eat-comment /> - - <!-- Group of permissions that allow manipulation of how - another application displays UI to the user. --> - <permission-group android:name="android.permission-group.DISPLAY" - android:label="@string/permgrouplab_display" - android:icon="@drawable/perm_group_display" - android:description="@string/permgroupdesc_display" - android:priority="190"/> - - <!-- Allows an application to open windows using the type - {@link android.view.WindowManager.LayoutParams#TYPE_SYSTEM_ALERT}, - shown on top of all other applications. Very few applications - should use this permission; these windows are intended for - system-level interaction with the user. --> - <permission android:name="android.permission.SYSTEM_ALERT_WINDOW" - android:permissionGroup="android.permission-group.DISPLAY" - android:protectionLevel="dangerous" - android:label="@string/permlab_systemAlertWindow" - android:description="@string/permdesc_systemAlertWindow" /> - - <!-- ================================== --> - <!-- Permissions affecting the system wallpaper --> - <!-- ================================== --> - <eat-comment /> - - <!-- Group of permissions that allow manipulation of how - another application displays UI to the user. --> - <permission-group android:name="android.permission-group.WALLPAPER" - android:label="@string/permgrouplab_wallpaper" - android:icon="@drawable/perm_group_wallpaper" - android:description="@string/permgroupdesc_wallpaper" - android:priority="150" /> - - <!-- Allows applications to set the wallpaper --> - <permission android:name="android.permission.SET_WALLPAPER" - android:permissionGroup="android.permission-group.WALLPAPER" - android:protectionLevel="normal" - android:label="@string/permlab_setWallpaper" - android:description="@string/permdesc_setWallpaper" /> - - <!-- Allows applications to set the wallpaper hints --> - <permission android:name="android.permission.SET_WALLPAPER_HINTS" - android:permissionGroup="android.permission-group.WALLPAPER" - android:protectionLevel="normal" - android:label="@string/permlab_setWallpaperHints" - android:description="@string/permdesc_setWallpaperHints" /> - - <!-- ============================================ --> - <!-- Permissions for changing the system clock --> - <!-- ============================================ --> - <eat-comment /> - - <!-- Group of permissions that are related to system clock. --> - <permission-group android:name="android.permission-group.SYSTEM_CLOCK" - android:label="@string/permgrouplab_systemClock" - android:icon="@drawable/perm_group_system_clock" - android:description="@string/permgroupdesc_systemClock" - android:priority="140" /> - - <!-- Allows applications to set the system time --> - <permission android:name="android.permission.SET_TIME" - android:protectionLevel="signature|system" - android:label="@string/permlab_setTime" - android:description="@string/permdesc_setTime" /> - - <!-- Allows applications to set the system time zone --> - <permission android:name="android.permission.SET_TIME_ZONE" - android:permissionGroup="android.permission-group.SYSTEM_CLOCK" - android:protectionLevel="normal" - android:label="@string/permlab_setTimeZone" - android:description="@string/permdesc_setTimeZone" /> - - <!-- ==================================================== --> - <!-- Permissions related to changing status bar --> - <!-- ==================================================== --> - - <!-- Used for permissions that change the status bar --> - <permission-group android:name="android.permission-group.STATUS_BAR" - android:label="@string/permgrouplab_statusBar" - android:icon="@drawable/perm_group_status_bar" - android:description="@string/permgroupdesc_statusBar" - android:priority="110" /> - - <!-- Allows an application to expand or collapse the status bar. --> - <permission android:name="android.permission.EXPAND_STATUS_BAR" - android:permissionGroup="android.permission-group.STATUS_BAR" - android:protectionLevel="normal" - android:label="@string/permlab_expandStatusBar" - android:description="@string/permdesc_expandStatusBar" /> - - <!-- ==================================================== --> - <!-- Permissions related to accessing sync settings --> - <!-- ==================================================== --> - - <!-- Used for permissions that access the sync settings or sync - related information. --> - <permission-group android:name="android.permission-group.SYNC_SETTINGS" - android:label="@string/permgrouplab_syncSettings" - android:icon="@drawable/perm_group_sync_settings" - android:description="@string/permgroupdesc_syncSettings" - android:priority="120" /> - - <!-- Allows applications to read the sync settings --> - <permission android:name="android.permission.READ_SYNC_SETTINGS" - android:permissionGroup="android.permission-group.SYNC_SETTINGS" - android:protectionLevel="normal" - android:description="@string/permdesc_readSyncSettings" - android:label="@string/permlab_readSyncSettings" /> - - <!-- Allows applications to write the sync settings --> - <permission android:name="android.permission.WRITE_SYNC_SETTINGS" - android:permissionGroup="android.permission-group.SYNC_SETTINGS" - android:protectionLevel="normal" - android:description="@string/permdesc_writeSyncSettings" - android:label="@string/permlab_writeSyncSettings" /> - - <!-- Allows applications to read the sync stats --> - <permission android:name="android.permission.READ_SYNC_STATS" - android:permissionGroup="android.permission-group.SYNC_SETTINGS" - android:protectionLevel="normal" - android:description="@string/permdesc_readSyncStats" - android:label="@string/permlab_readSyncStats" /> - - - <!-- ============================================ --> - <!-- Permissions for low-level system interaction --> - <!-- ============================================ --> - <eat-comment /> - - <!-- Group of permissions that are related to system APIs. Many - of these are not permissions the user will be expected to understand, - and such permissions should generally be marked as "normal" protection - level so they don't get displayed. This can also, however, be used - for miscellaneous features that provide access to the operating system, - such as writing the global system settings. --> - <permission-group android:name="android.permission-group.SYSTEM_TOOLS" - android:label="@string/permgrouplab_systemTools" - android:icon="@drawable/perm_group_system_tools" - android:description="@string/permgroupdesc_systemTools" - android:priority="100" /> - <!-- @hide Change the screen compatibility mode of applications --> <permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -1175,37 +802,25 @@ as locale. --> <permission android:name="android.permission.CHANGE_CONFIGURATION" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="signature|system|development" + android:protectionLevel="dangerous" android:label="@string/permlab_changeConfiguration" android:description="@string/permdesc_changeConfiguration" /> - <!-- Allows an application to read or write the system settings. --> - <permission android:name="android.permission.WRITE_SETTINGS" + <!-- @deprecated The {@link android.app.ActivityManager#restartPackage} + API is no longer supported. --> + <permission android:name="android.permission.RESTART_PACKAGES" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" android:protectionLevel="normal" - android:label="@string/permlab_writeSettings" - android:description="@string/permdesc_writeSettings" /> - - <!-- Allows an application to modify the Google service map. --> - <permission android:name="android.permission.WRITE_GSERVICES" - android:protectionLevel="signature|system" - android:label="@string/permlab_writeGservices" - android:description="@string/permdesc_writeGservices" /> - - <!-- @hide Change the screen compatibility mode of applications --> - <permission android:name="android.permission.SET_SCREEN_COMPATIBILITY" - android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="signature" - android:label="@string/permlab_setScreenCompatibility" - android:description="@string/permdesc_setScreenCompatibility" /> + android:label="@string/permlab_killBackgroundProcesses" + android:description="@string/permdesc_killBackgroundProcesses" /> - <!-- Allows an application to modify the current configuration, such - as locale. --> - <permission android:name="android.permission.CHANGE_CONFIGURATION" + <!-- Allows an application to call + {@link android.app.ActivityManager#killBackgroundProcesses}. --> + <permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="system|signature" - android:label="@string/permlab_changeConfiguration" - android:description="@string/permdesc_changeConfiguration" /> + android:protectionLevel="normal" + android:label="@string/permlab_killBackgroundProcesses" + android:description="@string/permdesc_killBackgroundProcesses" /> <!-- Allows an application to call {@link android.app.ActivityManager#forceStopPackage}. @@ -1224,6 +839,17 @@ android:label="@string/permlab_retrieve_window_content" android:description="@string/permdesc_retrieve_window_content" /> + <!-- Allows an application to open windows using the type + {@link android.view.WindowManager.LayoutParams#TYPE_SYSTEM_ALERT}, + shown on top of all other applications. Very few applications + should use this permission; these windows are intended for + system-level interaction with the user. --> + <permission android:name="android.permission.SYSTEM_ALERT_WINDOW" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:label="@string/permlab_systemAlertWindow" + android:description="@string/permdesc_systemAlertWindow" /> + <!-- Modify the global animation scaling factor. --> <permission android:name="android.permission.SET_ANIMATION_SCALE" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -1235,7 +861,7 @@ not use. Allow an application to make its activities persistent. --> <permission android:name="android.permission.PERSISTENT_ACTIVITY" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="normal" + android:protectionLevel="dangerous" android:label="@string/permlab_persistentActivity" android:description="@string/permdesc_persistentActivity" /> @@ -1282,17 +908,52 @@ android:label="@string/permlab_broadcastSticky" android:description="@string/permdesc_broadcastSticky" /> + <!-- Allows using PowerManager WakeLocks to keep processor from sleeping or screen + from dimming --> + <permission android:name="android.permission.WAKE_LOCK" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:label="@string/permlab_wakeLock" + android:description="@string/permdesc_wakeLock" /> + + <!-- Allows applications to set the wallpaper --> + <permission android:name="android.permission.SET_WALLPAPER" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="normal" + android:label="@string/permlab_setWallpaper" + android:description="@string/permdesc_setWallpaper" /> + + <!-- Allows applications to set the wallpaper hints --> + <permission android:name="android.permission.SET_WALLPAPER_HINTS" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="normal" + android:label="@string/permlab_setWallpaperHints" + android:description="@string/permdesc_setWallpaperHints" /> + + <!-- Allows applications to set the system time --> + <permission android:name="android.permission.SET_TIME" + android:protectionLevel="signature|system" + android:label="@string/permlab_setTime" + android:description="@string/permdesc_setTime" /> + + <!-- Allows applications to set the system time zone --> + <permission android:name="android.permission.SET_TIME_ZONE" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:label="@string/permlab_setTimeZone" + android:description="@string/permdesc_setTimeZone" /> + <!-- Allows mounting and unmounting file systems for removable storage. --> <permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="system|signature" + android:protectionLevel="dangerous" android:label="@string/permlab_mount_unmount_filesystems" android:description="@string/permdesc_mount_unmount_filesystems" /> <!-- Allows formatting file systems for removable storage. --> <permission android:name="android.permission.MOUNT_FORMAT_FILESYSTEMS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="system|signature" + android:protectionLevel="dangerous" android:label="@string/permlab_mount_format_filesystems" android:description="@string/permdesc_mount_format_filesystems" /> @@ -1336,6 +997,34 @@ android:label="@string/permlab_asec_rename" android:description="@string/permdesc_asec_rename" /> + <!-- Allows applications to disable the keyguard --> + <permission android:name="android.permission.DISABLE_KEYGUARD" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:description="@string/permdesc_disableKeyguard" + android:label="@string/permlab_disableKeyguard" /> + + <!-- Allows applications to read the sync settings --> + <permission android:name="android.permission.READ_SYNC_SETTINGS" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="normal" + android:description="@string/permdesc_readSyncSettings" + android:label="@string/permlab_readSyncSettings" /> + + <!-- Allows applications to write the sync settings --> + <permission android:name="android.permission.WRITE_SYNC_SETTINGS" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:description="@string/permdesc_writeSyncSettings" + android:label="@string/permlab_writeSyncSettings" /> + + <!-- Allows applications to read the sync stats --> + <permission android:name="android.permission.READ_SYNC_STATS" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="normal" + android:description="@string/permdesc_readSyncStats" + android:label="@string/permlab_readSyncStats" /> + <!-- Allows applications to write the apn settings --> <permission android:name="android.permission.WRITE_APN_SETTINGS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -1359,10 +1048,41 @@ <!-- Allows applications to change network connectivity state --> <permission android:name="android.permission.CHANGE_NETWORK_STATE" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="normal" + android:protectionLevel="dangerous" android:description="@string/permdesc_changeNetworkState" android:label="@string/permlab_changeNetworkState" /> + <!-- Allows applications to change Wi-Fi connectivity state --> + <permission android:name="android.permission.CHANGE_WIFI_STATE" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:description="@string/permdesc_changeWifiState" + android:label="@string/permlab_changeWifiState" /> + + + <!-- @hide --> + <permission android:name="android.permission.CHANGE_WIMAX_STATE" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:description="@string/permdesc_changeWimaxState" + android:label="@string/permlab_changeWimaxState" /> + + + + <!-- Allows applications to enter Wi-Fi Multicast mode --> + <permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:description="@string/permdesc_changeWifiMulticastState" + android:label="@string/permlab_changeWifiMulticastState" /> + + <!-- Allows applications to discover and pair bluetooth devices --> + <permission android:name="android.permission.BLUETOOTH_ADMIN" + android:permissionGroup="android.permission-group.SYSTEM_TOOLS" + android:protectionLevel="dangerous" + android:description="@string/permdesc_bluetoothAdmin" + android:label="@string/permlab_bluetoothAdmin" /> + <!-- Allows an application to clear the caches of all installed applications on the device. --> <permission android:name="android.permission.CLEAR_APP_CACHE" @@ -1389,8 +1109,7 @@ purposes. --> <permission-group android:name="android.permission-group.DEVELOPMENT_TOOLS" android:label="@string/permgrouplab_developmentTools" - android:description="@string/permgroupdesc_developmentTools" - android:priority="310" /> + android:description="@string/permgroupdesc_developmentTools" /> <!-- Allows an application to read or write the secure system settings. --> <permission android:name="android.permission.WRITE_SECURE_SETTINGS" diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo1.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo1.png Binary files differindex bf3cabb..7efb94f 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo1.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo1.png diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo2.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo2.png Binary files differindex c4f00be..00e6879 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo2.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo2.png diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo3.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo3.png Binary files differindex 935e44f..3ffcd68 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo3.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo3.png diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo4.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo4.png Binary files differindex 03ae28b..a5e94f7 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo4.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo4.png diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo5.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo5.png Binary files differindex b68981f..dfdeba3 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo5.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo5.png diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo6.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo6.png Binary files differindex 678b772..5b02b13 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo6.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo6.png diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo7.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo7.png Binary files differindex 0aeb0a6..815f31b 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo7.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo7.png diff --git a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo8.png b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo8.png Binary files differindex 1bd7312..936794c 100644 --- a/core/res/res/drawable-hdpi/progressbar_indeterminate_holo8.png +++ b/core/res/res/drawable-hdpi/progressbar_indeterminate_holo8.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo1.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo1.png Binary files differindex 1e5d956..5a9dec3 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo1.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo1.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo2.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo2.png Binary files differindex d0c0200..184b280 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo2.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo2.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo3.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo3.png Binary files differindex bfdc5ea..96f0644 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo3.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo3.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo4.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo4.png Binary files differindex 1440bc8..2393a2c 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo4.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo4.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo5.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo5.png Binary files differindex 4f645fa..4c1d60d 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo5.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo5.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo6.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo6.png Binary files differindex 21966fd..cb89d16 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo6.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo6.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo7.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo7.png Binary files differindex 7ca15ed..a4f843a 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo7.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo7.png diff --git a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo8.png b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo8.png Binary files differindex 369d0ac..ea1ee05 100644 --- a/core/res/res/drawable-mdpi/progressbar_indeterminate_holo8.png +++ b/core/res/res/drawable-mdpi/progressbar_indeterminate_holo8.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo1.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo1.png Binary files differindex ca24502..f541e32 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo1.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo1.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo2.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo2.png Binary files differindex 5653118..4c3f686 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo2.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo2.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo3.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo3.png Binary files differindex 438b1b5..42ccc49 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo3.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo3.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo4.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo4.png Binary files differindex efe3fed..e5f0cd3 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo4.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo4.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo5.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo5.png Binary files differindex cb7931c..415494b 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo5.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo5.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo6.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo6.png Binary files differindex 8ff7ee9..297d7b7 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo6.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo6.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo7.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo7.png Binary files differindex ce07298..ba152f2 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo7.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo7.png diff --git a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo8.png b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo8.png Binary files differindex 87e9d8f..b996b94 100644 --- a/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo8.png +++ b/core/res/res/drawable-xhdpi/progressbar_indeterminate_holo8.png diff --git a/core/res/res/drawable/ic_lockscreen_search.xml b/core/res/res/drawable/ic_lockscreen_search.xml index 4040153..d7a5b00 100644 --- a/core/res/res/drawable/ic_lockscreen_search.xml +++ b/core/res/res/drawable/ic_lockscreen_search.xml @@ -31,6 +31,6 @@ android:state_enabled="true" android:state_active="false" android:state_focused="true" - android:drawable="@drawable/ic_lockscreen_google_activated" /> + android:drawable="@drawable/ic_lockscreen_google_focused" /> </selector> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 51be22d..801fdf6 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -881,6 +881,11 @@ <java-symbol type="string" name="granularity_label_word" /> <java-symbol type="string" name="granularity_label_link" /> <java-symbol type="string" name="granularity_label_line" /> + <java-symbol type="string" name="default_audio_route_name" /> + <java-symbol type="string" name="default_audio_route_name_headphones" /> + <java-symbol type="string" name="default_audio_route_name_dock_speakers" /> + <java-symbol type="string" name="default_audio_route_name_hdmi" /> + <java-symbol type="string" name="default_audio_route_category_name" /> <java-symbol type="plurals" name="abbrev_in_num_days" /> <java-symbol type="plurals" name="abbrev_in_num_hours" /> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 4cac3ec..ec8634a9 100755 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -390,12 +390,11 @@ <!-- 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_personalInfo">Your personal information</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_personalInfo">Direct access to information about you, stored in on your contact card.</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_socialInfo">Your social information</string> + <string name="permgroupdesc_personalInfo" product="tablet">Direct access to your contacts + and calendar stored on the tablet.</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_socialInfo">Direct access to information about your contacts and social connections.</string> + <string name="permgroupdesc_personalInfo" product="default">Direct access to your contacts + and calendar stored on the phone.</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_location">Your location</string> @@ -408,91 +407,6 @@ <string name="permgroupdesc_network">Access various network features.</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_bluetoothNetwork">Bluetooth</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_bluetoothNetwork">Access devices and networks through Bluetooth.</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_shortrangeNetwork">Short-range Networks</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_shortrangeNetwork">Access devices through short-range networks such as NFC.</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_audioSettings">Audio Settings</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_audioSettings">Change audio settings.</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_affectsBattery">Affects Battery</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_affectsBattery">Use features that can quickly drain battery.</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_calendar">Calendar</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_calendar">Direct access to calendar and events.</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_dictionary">Read User Dictionary</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_dictionary">Read words in user dictionary.</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_writeDictionary">Write User Dictionary</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_writeDictionary">Add words to the user dictionary.</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_bookmarks">Bookmarks and History</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_bookmarks">Direct access to bookmarks and browser history.</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_deviceAlarms">Alarm</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_deviceAlarms">Set the alarm clock.</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_voicemail">Voicemail</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_voicemail">Direct access to voicemail.</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_microphone">Microphone</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_microphone">Direct access to the microphone to record audio.</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_camera">Camera</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_camera">Direct access to camera for image or video capture.</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_appInfo">Your applications information</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_appInfo">Ability to affect behavior of other applications on your device.</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_wallpaper">Wallpaper</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_wallpaper">Change the device wallpaper settings.</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_systemClock">Clock</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_systemClock">Change the device time or timezone.</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_statusBar">Status Bar</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_statusBar">Change the device status bar settings.</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_syncSettings">Sync Settings</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_syncSettings">Access to the sync settings.</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> @@ -518,11 +432,6 @@ <string name="permgroupdesc_developmentTools">Features only needed for app developers.</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_display">Other Application UI</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_display">Effect the UI of other applications.</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_storage">Storage</string> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] --> <string name="permgroupdesc_storage" product="nosdcard">Access the USB storage.</string> @@ -549,23 +458,23 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_processOutgoingCalls">reroute outgoing calls</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_processOutgoingCalls">Allows the app to - process outgoing calls and change the number to be dialed. Malicious - apps may monitor, redirect, or prevent outgoing calls.</string> + <string name="permdesc_processOutgoingCalls">Allows the app to process + outgoing calls and change the number to be dialed. This permission allows + the app to monitor, redirect, or prevent outgoing calls.</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_receiveSms">receive text messages (SMS)</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_receiveSms">Allows the app to receive - and process SMS messages. Malicious apps may monitor - your messages or delete them without showing them to you.</string> + <string name="permdesc_receiveSms">Allows the app to receive and process SMS + messages. This means the app could monitor or delete messages sent to your + device without showing them to you.</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_receiveMms">receive text messages (MMS)</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_receiveMms">Allows the app to receive - and process MMS messages. Malicious apps may monitor - your messages or delete them without showing them to you.</string> + <string name="permdesc_receiveMms">Allows the app to receive and process MMS + messages. This means the app could monitor or delete messages sent to your + device without showing them to you.</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_receiveEmergencyBroadcast">receive emergency broadcasts</string> @@ -586,27 +495,27 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_sendSms">send SMS messages</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_sendSms">Allows the app to send SMS - messages. Malicious apps may cost you money by sending - messages without your confirmation.</string> + <string name="permdesc_sendSms">Allows the app to send SMS messages. + This may result in unexpected charges. Malicious apps may cost you money by + sending messages without your confirmation.</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_sendSmsNoConfirmation">send SMS messages with no confirmation</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_sendSmsNoConfirmation">Allows the app to send SMS - messages. Malicious apps may cost you money by sending - messages without your confirmation.</string> + messages. This may result in unexpected charges. Malicious apps may cost + you money by sending messages without your confirmation.</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_readSms">read your text messages (SMS or MMS)</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readSms" product="tablet">Allows the app to read - SMS messages stored on your tablet or SIM card. Malicious apps - may read your confidential messages.</string> + <string name="permdesc_readSms" product="tablet">Allows the app to read SMS + messages stored on your tablet or SIM card. This allows the app to read all + SMS messages, regardless of content or confidentiality.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readSms" product="default">Allows the app to read - SMS messages stored on your phone or SIM card. Malicious apps - may read your confidential messages.</string> + <string name="permdesc_readSms" product="default">Allows the app to read SMS + messages stored on your phone or SIM card. This allows the app to read all + SMS messages, regardless of content or confidentiality.</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_writeSms">edit your text messages (SMS or MMS)</string> @@ -622,30 +531,30 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_receiveWapPush">receive text messages (WAP)</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_receiveWapPush">Allows the app to receive - and process WAP messages. Malicious apps may monitor - your messages or delete them without showing them to you.</string> + <string name="permdesc_receiveWapPush">Allows the app to receive and process + WAP messages. This permission includes the ability to monitor or delete + messages sent to you without showing them to you.</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_getTasks">retrieve running apps</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_getTasks">Allows the app to retrieve - information about currently and recently running tasks. Malicious apps may - discover private information about other apps.</string> + + <string name="permdesc_getTasks">Allows the app to retrieve information + about currently and recently running tasks. This may allow the app to + discover information about which applications are used on the device.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=50] --> <string name="permlab_getDetailedTasks">retrieve details of running apps</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE] --> <string name="permdesc_getDetailedTasks">Allows the app to retrieve - detailed information about currently and recently running tasks. Malicious apps may + detailed information about currently and recently running tasks. Malicious apps may discover private information about other apps.</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_reorderTasks">reorder running apps</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_reorderTasks">Allows the app to move - tasks to the foreground and background. Malicious apps may force - themselves to the front without your control.</string> + <string name="permdesc_reorderTasks">Allows the app to move tasks to the + foreground and background. The app may do this without your input.</string> <!-- Title of an application permission, allowing an application to remove/kill tasks --> <string name="permlab_removeTasks">stop running apps</string> @@ -689,9 +598,9 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_killBackgroundProcesses">close other apps</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_killBackgroundProcesses">Allows the app to - kill background processes of other apps, even if memory - isn\'t low.</string> + <string name="permdesc_killBackgroundProcesses">Allows the app to end + background processes of other apps. This may cause other apps to stop + running.</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_forceStopPackages">force stop other apps</string> @@ -804,9 +713,9 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_systemAlertWindow">draw over other apps</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_systemAlertWindow">Allows the app to - show system alert windows. Malicious apps may take over the - entire screen.</string> + <string name="permdesc_systemAlertWindow">Allows the app to show system + alert windows. Some alert windows may take over the entire screen. + </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_setAnimationScale">modify global animation speed</string> @@ -910,9 +819,8 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_persistentActivity">make app always run</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_persistentActivity">Allows the app to make - parts of itself persistent, so the system can\'t use it for other - apps.</string> + <string name="permdesc_persistentActivity" product="tablet">Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the tablet.</string> + <string name="permdesc_persistentActivity" product="default">Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the phone.</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_deletePackages">delete apps</string> @@ -1049,56 +957,60 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_broadcastSticky">send sticky broadcast</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_broadcastSticky" product="tablet">Allows the app to send - sticky broadcasts, which remain after the broadcast ends. - Malicious apps may make the tablet slow or unstable by causing it - to use too much memory.</string> + <string name="permdesc_broadcastSticky" product="tablet">Allows the app to + send sticky broadcasts, which remain after the broadcast ends. Excessive use + may make the tablet slow or unstable by causing it to use too much memory. + </string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_broadcastSticky" product="default">Allows the app to send - sticky broadcasts, which remain after the broadcast ends. - Malicious apps may make the phone slow or unstable by causing it - to use too much memory.</string> + <string name="permdesc_broadcastSticky" product="default">Allows the app to + send sticky broadcasts, which remain after the broadcast ends. Excessive + use may make the phone slow or unstable by causing it to use too + much memory.</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_readContacts">read your contacts</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readContacts" product="tablet">Allows the app to read all - the data about your contacts stored on your tablet, including the frequency - with which you\'ve called, emailed, or communicated in other ways with specific - individuals. This helps with auto-completion of email addresses and other convenient - features. Malicious apps can use this permission to send your contact data to - other people.</string> + <string name="permdesc_readContacts" product="tablet">Allows the app to read + data about your contacts stored on your tablet, including the frequency + with which you\'ve called, emailed, or communicated in other ways with + specific individuals. This permission allows apps to save your contact + data, and malicious apps may share contact data without your + knowledge.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readContacts" product="default">Allows the app to read all - the data about your contacts stored on your phone, including the frequency - with which you\'ve called, emailed, or communicated in other ways with specific - individuals. This helps with auto-completion of email addresses and other convenient - features. Malicious apps can use this permission to send your contact data to - other people.</string> + <string name="permdesc_readContacts" product="default">Allows the app to + read data about your contacts stored on your phone, including the + frequency with which you\'ve called, emailed, or communicated in other ways + with specific individuals. This permission allows apps to save your + contact data, and malicious apps may share contact data without your + knowledge.</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_writeContacts">modify your contacts</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_writeContacts" product="tablet">Allows the app to modify - the data about your contacts stored on your tablet, including the frequency - with which you\'ve called, emailed, or communicated in other ways with specific - individuals. This helps with auto-completion of email addresses and other convenient - features. Malicious apps may use this to erase or modify your contact data.</string> + <string name="permdesc_writeContacts" product="tablet">Allows the app to + modify the data about your contacts stored on your tablet, including the + frequency with which you\'ve called, emailed, or communicated in other ways + with specific contacts. This permission allows apps to delete contact + data.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_writeContacts" product="default">Allows the app to modify - the data about your contacts stored on your phone, including the frequency - with which you\'ve called, emailed, or communicated in other ways with specific - individuals. This helps with auto-completion of email addresses and other convenient - features. Malicious apps may use this to erase or modify your contact data.</string> + <string name="permdesc_writeContacts" product="default">Allows the app to + modify the data about your contacts stored on your phone, including the + frequency with which you\'ve called, emailed, or communicated in other ways + with specific contacts. This permission allows apps to delete contact + data.</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_readCallLog">read call log</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readCallLog" product="tablet">Allows the app to read your tablet\'s call log, including data about incoming and outgoing calls. - Malicious apps may use this to send your data to other people.</string> + <string name="permdesc_readCallLog" product="tablet">Allows the app to read + your tablet\'s call log, including data about incoming and outgoing calls. + This permission allows apps to save your call log data, and malicious apps + may share call log data without your knowledge.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readCallLog" product="default">Allows the app to read your phone\'s call log, including data about incoming and outgoing calls. - Malicious apps may use this to send your data to other people.</string> + <string name="permdesc_readCallLog" product="default">Allows the app to read + your phone\'s call log, including data about incoming and outgoing calls. + This permission allows apps to save your call log data, and malicious apps + may share call log data without your knowledge.</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_writeCallLog">write call log</string> @@ -1113,93 +1025,110 @@ <!-- Title of the read profile permission, listed so the user can decide whether to allow the application to read the user's personal profile data. [CHAR LIMIT=30] --> <string name="permlab_readProfile">read your own contact card</string> <!-- Description of the read profile permission, listed so the user can decide whether to allow the application to read the user's personal profile data. [CHAR LIMIT=NONE] --> - <string name="permdesc_readProfile" product="default">Allows the app to read personal - profile information stored on your device, such as your name and contact information. This - means the app can identify you and send your profile information to others.</string> + <string name="permdesc_readProfile" product="default">Allows the app to read + personal profile information stored on your device, such as your name and + contact information. This means the app can identify you and may send your + profile information to others.</string> <!-- Title of the write profile permission, listed so the user can decide whether to allow the application to write to the user's personal profile data. [CHAR LIMIT=30] --> <string name="permlab_writeProfile">modify your own contact card</string> <!-- Description of the write profile permission, listed so the user can decide whether to allow the application to write to the user's personal profile data. [CHAR LIMIT=NONE] --> - <string name="permdesc_writeProfile" product="default">Allows the app to change or add - to personal profile information stored on your device, such as your name and contact - information. This means other apps can identify you and send your profile - information to others.</string> + <string name="permdesc_writeProfile" product="default">Allows the app to + change or add to personal profile information stored on your device, such + as your name and contact information. This means the app can identify you + and may send your profile information to others.</string> <!-- Title of the read social stream permission, listed so the user can decide whether to allow the application to read information from the user's social stream. [CHAR LIMIT=30] --> <string name="permlab_readSocialStream" product="default">read your social stream</string> - <string name="permdesc_readSocialStream" product="default">Allows the app to access - and sync social updates from you and your friends. Malicious apps may use this to read - private communications between you and your friends on social networks.</string> + <string name="permdesc_readSocialStream" product="default">Allows the app + to access and sync social updates from you and your friends. Be careful + when sharing information -- this allows the app to read communications + between you and your friends on social networks, regardless of + confidentiality. Note: this permission may not be enforced on all social + networks.</string> <!-- Title of the write social stream permission, listed so the user can decide whether to allow the application to write information to the user's social stream. [CHAR LIMIT=30] --> <string name="permlab_writeSocialStream" product="default">write to your social stream</string> - <string name="permdesc_writeSocialStream" product="default">Allows the app to display - social updates from your friends. Malicious apps may use this to pretend to be a friend - and trick you into revealing passwords or other confidential information.</string> - + <string name="permdesc_writeSocialStream" product="default">Allows the app to + display social updates from your friends. Be careful when sharing + information -- this allows the app to produce messages that may appear to + come from a friend. Note: this permission may not be enforced on all social + networks.</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_readCalendar">read calendar events plus confidential information</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readCalendar" product="tablet">Allows the app to read all calendar - events stored on your tablet, including those of friends or coworkers. Malicious apps - may extract personal information from these calendars without the owners\' knowledge.</string> + + <string name="permdesc_readCalendar" product="tablet">Allows the app to read + all calendar events stored on your tablet, including those of friends or + co-workers. This may allow the app to share or save your calendar data, + regardless of confidentiality or sensitivity.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readCalendar" product="default">Allows the app to read all calendar - events stored on your phone, including those of friends or coworkers. Malicious apps - may extract personal information from these calendars without the owners\' knowledge.</string> + <string name="permdesc_readCalendar" product="default">Allows the app to + read all calendar events stored on your phone, including those of friends + or co-workers. This may allow the app to share or save your calendar data, + regardless of confidentiality or sensitivity.</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_writeCalendar">add or modify calendar events and send email to guests without owners\' knowledge</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_writeCalendar">Allows the app to send event invitations as the calendar owner and add, remove, - change events that you can modify on your device, including those of friends or co-workers. Malicious apps - may send spam emails that appear to come from calendar owners, modify events without the owners\' knowledge, or add fake events.</string> + +<string name="permdesc_writeCalendar" product="tablet">Allows the app to + add, remove, change events that you can modify on your tablet, including + those of friends or co-workers. This may allow the app to send messages + that appear to come from calendar owners, or modify events without the + owners\' knowledge.</string> +<string name="permdesc_writeCalendar" product="default">Allows the app to + add, remove, change events that you can modify on your phone, including + those of friends or co-workers. This may allow the app to send messages + that appear to come from calendar owners, or modify events without the + owners\' knowledge.</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_accessMockLocation">mock location sources for testing</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessMockLocation">Allows the app to create mock location sources for testing. - Malicious apps may use this to override the location and/or status returned by real - location sources such as GPS or network providers.</string> + <string name="permdesc_accessMockLocation">Create mock location sources for + testing or install a new location provider. This allows the app to + override the location and/or status returned by other location sources + such as GPS or location providers.</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_accessLocationExtraCommands">access extra location provider commands</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessLocationExtraCommands">Allows the app to access extra location provider commands. - Malicious apps may use this to interfere with the operation of the GPS - or other location sources.</string> + <string name="permdesc_accessLocationExtraCommands">Allows the app to access + extra location provider commands. This may allow the app to to interfere + with the operation of the GPS or other location sources.</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_installLocationProvider">permission to install a location provider</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_installLocationProvider">Create mock location sources for testing. - Malicious apps may use this to override the location and/or status returned by real - location sources such as GPS or Network providers or monitor and report your location to an external source.</string> + <string name="permdesc_installLocationProvider">Create mock location sources + for testing or install a new location provider. This allows the app to + override the location and/or status returned by other location sources + such as GPS or location providers.</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_accessFineLocation">fine (GPS) location</string> + <string name="permlab_accessFineLocation">precise (GPS) location</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessFineLocation" product="tablet">Access fine location sources such as the - Global Positioning System on the tablet, where available. - Malicious apps may use this to determine where you are, and may - consume additional battery power.</string> + <string name="permdesc_accessFineLocation" product="tablet">Access precise + location sources such as the Global Positioning System on the tablet. When + location services are available and turned on, this permission allows the + app to determine your precise location.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessFineLocation" product="default">Access fine location sources such as the - Global Positioning System on the phone, where available. - Malicious apps may use this to determine where you are, and may - consume additional battery power.</string> + <string name="permdesc_accessFineLocation" product="default">Access precise + location sources such as the Global Positioning System on the phone. When + location services are available and turned on, this permission allows the + app to determine your precise location.</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_accessCoarseLocation">coarse (network-based) location</string> - <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessCoarseLocation" product="tablet">Access coarse location sources such as the cellular - network database to determine an approximate tablet location, where available. Malicious - apps may use this to determine approximately where you are.</string> + <string name="permlab_accessCoarseLocation">approximate (network-based) location</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessCoarseLocation" product="default">Access coarse location sources such as the cellular - network database to determine an approximate phone location, where available. Malicious - apps may use this to determine approximately where you are.</string> + <string name="permdesc_accessCoarseLocation">Access + approximate location from location providers using network sources such as + cell tower and Wi-Fi. When these location services are available and turned + on, this permission allows the app to determine your approximate + location.</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_accessSurfaceFlinger">access SurfaceFlinger</string> @@ -1214,19 +1143,21 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_modifyAudioSettings">change your audio settings</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_modifyAudioSettings">Allows the app to modify global audio settings such as volume and routing.</string> + <string name="permdesc_modifyAudioSettings">Allows the app to modify global audio settings such as volume and which speaker is used for output.</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_recordAudio">record audio</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_recordAudio">Allows the app to access the audio record path.</string> + <string name="permdesc_recordAudio">Allows the app to record audio with the + microphone. This permission allows the app to record audio at any time + without your confirmation.</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_camera">take pictures and videos</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_camera">Allows the app to take pictures and videos - with the camera. This allows the app at any time to collect - images the camera is seeing.</string> + with the camera. This permission allows the app to use the camera at any + time without your confirmation.</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_brick" product="tablet">permanently disable tablet</string> @@ -1318,10 +1249,11 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_callPhone">directly call phone numbers</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_callPhone">Allows the app to call - phone numbers without your intervention. Malicious apps may - cause unexpected calls on your phone bill. Note that this doesn\'t - allow the app to call emergency numbers.</string> + <string name="permdesc_callPhone">Allows the app to call phone numbers + without your intervention. This may result in unexpected charges or calls. + Note that this doesn\'t allow the app to call emergency numbers. + Malicious apps may cost you money by making calls without your + confirmation.</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_callPrivileged">directly call any phone numbers</string> @@ -1372,9 +1304,9 @@ <string name="permlab_readPhoneState">read phone status and identity</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_readPhoneState">Allows the app to access the phone - features of the device. An app with this permission can determine the phone - number and serial number of this phone, whether a call is active, the number that call - is connected to and the like.</string> + features of the device. This permission allows the app to determine the + phone number and device IDs, whether a call is active, and the remote number + connected by a call.</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_wakeLock" product="tablet">prevent tablet from sleeping</string> @@ -1445,9 +1377,13 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_getAccounts">find accounts on the device</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_getAccounts" product="tablet">Allows the app to get the list of accounts known by the tablet.</string> + <string name="permdesc_getAccounts" product="tablet">Allows the app to get + the list of accounts known by the tablet. This may include any accounts + created by applications you have installed.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_getAccounts" product="default">Allows the app to get the list of accounts known by the phone.</string> + <string name="permdesc_getAccounts" product="default">Allows the app to get + the list of accounts known by the phone. This may include any accounts + created by applications you have installed.</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_authenticateAccounts">create accounts and set passwords</string> @@ -1472,12 +1408,17 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_accessNetworkState">view network connections</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessNetworkState">Allows the app to view the state of all networks.</string> + <string name="permdesc_accessNetworkState">Allows the app to view + information about network connections such as which networks exist and are + connected.</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_createNetworkSockets">full Internet access</string> + <string name="permlab_createNetworkSockets">full network access</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_createNetworkSockets">Allows the app to create network sockets.</string> + <string name="permdesc_createNetworkSockets">Allows the app to create + network sockets and use custom network protocols. The browser and other + applications provide means to send data to the internet, so this + permission is not required to send data to the internet.</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_writeApnSettings">change/intercept network settings and traffic</string> @@ -1504,21 +1445,26 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_accessWifiState">view Wi-Fi connections</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_accessWifiState">Allows the app to view the information about the state of Wi-Fi.</string> + <string name="permdesc_accessWifiState">Allows the app to view information + about Wi-Fi networking, such as whether Wi-Fi is enabled and name of + connected Wi-Fi devices.</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_changeWifiState">connect and disconnect from Wi-Fi</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_changeWifiState">Allows the app to connect to and disconnect from Wi-Fi access points, and to make changes to - configured Wi-Fi networks.</string> + <string name="permdesc_changeWifiState">Allows the app to connect to and + disconnect from Wi-Fi access points and to make changes to device + configuration for Wi-Fi networks.</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_changeWifiMulticastState">allow Wi-Fi Multicast reception</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_changeWifiMulticastState">Allows the app to - receive packets not directly addressed to your device. This can be - useful when discovering services offered near by. It uses more power - than the non-multicast mode.</string> + <string name="permdesc_changeWifiMulticastState" product="tablet">Allows the app to receive + packets sent to all devices on a Wi-Fi network using multicast addresses, + not just your tablet. It uses more power than the non-multicast mode.</string> + <string name="permdesc_changeWifiMulticastState" product="default">Allows the app to receive + packets sent to all devices on a Wi-Fi network using multicast addresses, + not just your phone. It uses more power than the non-multicast mode.</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_bluetoothAdmin">access Bluetooth settings</string> @@ -1531,19 +1477,25 @@ the local Bluetooth phone, and to discover and pair with remote devices.</string> <string name="permlab_accessWimaxState">View WiMAX connections</string> - <string name="permdesc_accessWimaxState">Allows the app to view the information about the state of WiMAX.</string> + <string name="permdesc_accessWimaxState">Allows the app to determine whether + WiMAX is enabled and information about any WiMAX networks that are + connected. </string> + <string name="permlab_changeWimaxState">Change WiMAX state</string> - <string name="permdesc_changeWimaxState">Allows the app to connect to and disconnect from WiMAX network.</string> + <string name="permdesc_changeWimaxState" product="tablet">Allows the app to + connect the tablet to and disconnect the tablet from WiMAX networks.</string> + <string name="permdesc_changeWimaxState" product="default">Allows the app to + connect the phone to and disconnect the phone from WiMAX networks.</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_bluetooth">pair with Bluetooth devices</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_bluetooth" product="tablet">Allows the app to view the - configuration of the local Bluetooth tablet, and to make and accept + configuration of Bluetooth on the tablet, and to make and accept connections with paired devices.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permdesc_bluetooth" product="default">Allows the app to view the - configuration of the local Bluetooth phone, and to make and accept + configuration of the Bluetooth on the phone, and to make and accept connections with paired devices.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> @@ -1555,28 +1507,25 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_disableKeyguard">disable your screen lock</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_disableKeyguard">Allows the app to disable - the keylock and any associated password security. A legitimate example of - this is the phone disabling the keylock when receiving an incoming phone call, - then re-enabling the keylock when the call is finished.</string> + <string name="permdesc_disableKeyguard">Allows the app to disable the + keylock and any associated password security. For example, the phone + disables the keylock when receiving an incoming phone call, then + re-enables the keylock when the call is finished.</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_readSyncSettings">read sync settings</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readSyncSettings">Allows the app to read the sync settings, - such as whether sync is enabled for the People app.</string> + <string name="permdesc_readSyncSettings">Allows the app to read the sync settings for an account. For example, this can determine whether the People app is synced with an account.</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_writeSyncSettings">toggle sync on and off</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_writeSyncSettings">Allows the app to modify the sync - settings, such as whether sync is enabled for the People app.</string> + <string name="permdesc_writeSyncSettings">Allows an app to modify the sync settings for an account. For example, this can be used to enable sync of the People app with an account.</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_readSyncStats">read sync statistics</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readSyncStats">Allows the app to read the sync stats; e.g., the - history of syncs that have occurred.</string> + <string name="permdesc_readSyncStats">Allows an app to read the sync stats for an account, including the history of sync events and how much data is synced. </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> @@ -1592,8 +1541,8 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readDictionary">read terms you added to the dictionary</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readDictionary">Allows the app to read any private - words, names and phrases that the user may have stored in the user dictionary.</string> + <string name="permdesc_readDictionary">Allows the app to read all words, + names and phrases that the user may have stored in the user dictionary.</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_writeDictionary">write to user-defined dictionary</string> @@ -1602,13 +1551,13 @@ user dictionary.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] --> - <string name="permlab_sdcardRead" product="nosdcard">read the contents of your USB storage</string> + <string name="permlab_sdcardRead" product="nosdcard">test access to protected storage</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_sdcardRead" product="default">read the contents of your SD card</string> + <string name="permlab_sdcardRead" product="default">test access to protected storage</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] --> - <string name="permdesc_sdcardRead" product="nosdcard">Allows the app to read contents of USB storage, which may include photos and media.</string> + <string name="permdesc_sdcardRead" product="nosdcard">Allows the app to test a permission for USB storage that will be availabe on future devices. </string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_sdcardRead" product="default">Allows the app to read contents of SD card, which may include photos and media.</string> + <string name="permdesc_sdcardRead" product="default">Allows the app to test a permission for the SD card that will be available on future devices.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] --> <string name="permlab_sdcardWrite" product="nosdcard">modify or delete the contents of your USB storage</string> @@ -2386,21 +2335,28 @@ <string name="permlab_readHistoryBookmarks">read your Web bookmarks and history</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readHistoryBookmarks">Allows the app to read all - the URLs that the Browser has visited, and all of the Browser\'s bookmarks.</string> + <string name="permdesc_readHistoryBookmarks">Allows the app to read the + history of all URLs that the Browser has visited, and all of the Browser\'s + bookmarks. Note: this permission may not be enforced by third-party + browsers or other applications with web browsing capabilities.</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_writeHistoryBookmarks">write web bookmarks and history</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_writeHistoryBookmarks" product="tablet">Allows the app to modify the - Browser\'s history or bookmarks stored on your tablet. Malicious apps - may use this to erase or modify your Browser\'s data.</string> + <string name="permdesc_writeHistoryBookmarks" product="tablet">Allows the + app to modify the Browser\'s history or bookmarks stored on your tablet. + This may allow the app to erase or modify Browser data. Note: this + permission may note be enforced by third-party browsers or other + applications with web browsing capabilities.</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_writeHistoryBookmarks" product="default">Allows the app to modify the - Browser\'s history or bookmarks stored on your phone. Malicious apps - may use this to erase or modify your Browser\'s data.</string> + <string name="permdesc_writeHistoryBookmarks" product="default">Allows the + app to modify the Browser\'s history or bookmarks stored on your phone. + This may allow the app to erase or modify Browser data. Note: + this permission may note be enforced by third-party browsers or other + applications with web browsing capabilities.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> @@ -3193,6 +3149,11 @@ <!-- Description of an application permission, used to invoke default container service to copy content. --> <string name="permdesc_copyProtectedData">Allows the app to invoke default container service to copy content. Not for use by normal apps.</string> + <!-- Title of an application permission that lets an application route media output. --> + <string name="permlab_route_media_output">Route media output</string> + <!-- Description of an application permission that lets an application route media output. --> + <string name="permdesc_route_media_output">Allows an application to route media output to other external devices.</string> + <!-- Shown in the tutorial for tap twice for zoom control. --> <string name="tutorial_double_tap_to_zoom_message_short">Touch twice for zoom control</string> @@ -3607,4 +3568,25 @@ from the activity resolver to use just this once. [CHAR LIMIT=25] --> <string name="activity_resolver_use_once">Just once</string> + <!-- Name of the default audio route for tablets when nothing + is connected to a headphone or other wired audio output jack. [CHAR LIMIT=25] --> + <string name="default_audio_route_name" product="tablet">Tablet speakers</string> + + <!-- Name of the default audio route when nothing is connected to + a headphone or other wired audio output jack. [CHAR LIMIT=25] --> + <string name="default_audio_route_name" product="default">Phone speaker</string> + + <!-- Name of the default audio route when wired headphones are + connected. [CHAR LIMIT=25] --> + <string name="default_audio_route_name_headphones">Headphones</string> + + <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=25] --> + <string name="default_audio_route_name_dock_speakers">Dock speakers</string> + + <!-- Name of the default audio route when HDMI is connected. [CHAR LIMIT=25] --> + <string name="default_audio_route_name_hdmi">HDMI audio</string> + + <!-- Name of the default audio route category. [CHAR LIMIT=25] --> + <string name="default_audio_route_category_name">System</string> + </resources> |
