5155 Commits

Author SHA1 Message Date
Nick Kralevich
adb2578a05 am 96e44a2c: am 98ea19ed: Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev
* commit '96e44a2c2ce0579177c50a4fb710adc83530e968':
  Reenable optional permissions parsing and expose APIs
2013-03-27 17:24:15 -07:00
Nick Kralevich
98ea19ed24 Merge "Reenable optional permissions parsing and expose APIs" into jb-mr2-dev 2013-03-28 00:13:45 +00:00
Nick Kralevich
828c16f140 Reenable optional permissions parsing and expose APIs
Modify the package parsing code to understand optional permissions
(android:required="false"). This is essentially a rollback of
e824120016248bcfe3962883fe9f3b0481dd1c3d with some minor changes.

Expose the requestPermission API to third party apps. This allows
an app to request an Intent which, when passed to
startActivityForResult, will prompt the user to approve permissions
for an app.

In the event we decide to not launch with this feature, this change
can be rolled back.

Change-Id: Ie3626deae9b16e510323f94a2c80377f7c84b26f
2013-03-27 16:57:33 -07:00
Maggie Benthall
a12fccf57d Add user restrictions for bluetooth, sideloading, usb file transfer
Created constants for these in UserManager and current.txt. Also created
an accessor for individual user restrictions that takes the restriction key
(removing individual methods for particular restrictions).

Change-Id: Ibb5517cbcdffadd3925f52cbe67d7d525813faa9
2013-03-27 18:14:29 -04:00
Tim Murray
da13653964 am 25440d39: am 8ff0201a: Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev
* commit '25440d39ed679c33303fc23ada0b862fda4d5444':
  Revert "Remove all public mention of RS graphics from docs."
2013-03-27 14:37:07 -07:00
Tim Murray
8ff0201ad0 Merge "Revert "Remove all public mention of RS graphics from docs."" into jb-mr2-dev 2013-03-27 21:32:31 +00:00
Tim Murray
275812c2bb Revert "Remove all public mention of RS graphics from docs."
This reverts commit d72f932b8cbf461ebb79c249ce92b9b811122190

Change-Id: I056b13d0b2beb508e4215bc0d289cf3e76a3a986
2013-03-27 21:31:28 +00:00
Tim Murray
40f897a312 am 0e39ae10: am 8565520b: Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev
* commit '0e39ae1073c38afbce02f8470dcc717fd91f9751':
  Remove all public mention of RS graphics from docs.
2013-03-27 14:08:18 -07:00
Tim Murray
8565520b85 Merge "Remove all public mention of RS graphics from docs." into jb-mr2-dev 2013-03-27 21:01:37 +00:00
Yorke Lee
295a059795 am 7b1948b3: am 2e73f5b8: Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev
* commit '7b1948b3b99db4ad2af3cdc7f8625b6ac70fab93':
  Expose data_usage_stat table in ContactsContract
2013-03-27 12:19:23 -07:00
Yorke Lee
2e73f5b8b7 Merge "Expose data_usage_stat table in ContactsContract" into jb-mr2-dev 2013-03-27 19:14:09 +00:00
Yorke Lee
0dc523fa99 Expose data_usage_stat table in ContactsContract
Bug: 8124079
Change-Id: Ie60e489f08be270b9f3a4866c488a5e0598ceb26
2013-03-27 12:07:52 -07:00
Jean-Michel Trivi
8c9202b147 am 45554779: am f2b0fdb2: Merge "AudioEffect types in SDK" into jb-mr2-dev
* commit '455547795cdec66972546bbfd60d8697f5d8477e':
  AudioEffect types in SDK
2013-03-27 10:40:58 -07:00
Jean-Michel Trivi
f2b0fdb2f7 Merge "AudioEffect types in SDK" into jb-mr2-dev 2013-03-27 17:35:44 +00:00
Sungmin Choi
52a08cf683 make new API to retrieve group identifier level1
For mvno, user can add or edit mvno data field. To pre-provide
the mvno data of the edited apn when the user selects one of
the mvno types, need to support IMSI, SPN, and GID1 data.
To support GID1, make API to retrieve group identifier level1.

bug:6445254
Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb
2013-03-27 17:24:55 +00:00
Jean-Michel Trivi
80569f7ff7 AudioEffect types in SDK
Not all effect types are defined by OpenSL ES. Add the full UUID
 effect identifier in the superclass of all audio effects.

bug 8113082

Change-Id: I8dfc6cdcfd2a145e792fb3669e6132e6f19d1c16
2013-03-27 09:59:24 -07:00
Yorke Lee
778fde704a am 6b141509: am 038fbc5d: Merge "Add new apis to CP2" into jb-mr2-dev
* commit '6b141509ea8746e7ee50c8eb4d652e72864cd5e1':
  Add new apis to CP2
2013-03-27 09:51:26 -07:00
Yorke Lee
038fbc5d09 Merge "Add new apis to CP2" into jb-mr2-dev 2013-03-27 16:43:41 +00:00
Amith Yamasani
a1535223fe am f3dc9f0a: am df5e9fe1: Merge "Device Owner, a special kind of device admin" into jb-mr2-dev
* commit 'f3dc9f0aa91d2785b715f251b144487ec1b57ecc':
  Device Owner, a special kind of device admin
2013-03-26 15:31:33 -07:00
Amith Yamasani
df5e9fe181 Merge "Device Owner, a special kind of device admin" into jb-mr2-dev 2013-03-26 22:27:13 +00:00
Amith Yamasani
71e6c697e5 Device Owner, a special kind of device admin
A Device Owner cannot be uninstalled and is available to all users. It must
be registered before the device_provisioned flag is set.

Device admins can be disabled until used, but visible to device policy
manager, so that users wont be bothered with update requests.

Opened up a few related APIs for use by a system-installed Device Owner.

Change-Id: I847b5fe68c0f724863f778a67602b5bddc79d8e5
2013-03-26 15:09:08 -07:00
Guang Zhu
f63b15cb82 fix build: followup API change
Change-Id: I27e04a905c07491489c22e6fbdb73181f5dd4eb4
2013-03-25 21:49:51 -07:00
Fabrice Di Meglio
2a293a84b0 am 23ac93c3: am 172fc865: Merge "Fix the build" into jb-mr2-dev
* commit '23ac93c3e4abde239848aa99131d44a9c3859fad':
  Fix the build
2013-03-26 02:25:16 +00:00
Fabrice Di Meglio
768f272976 Fix the build
See bug #8200928

Change-Id: I014590f41d74f16cf3c3de618ef08ee490bf05aa
2013-03-25 19:18:18 -07:00
Tim Murray
d72f932b8c Remove all public mention of RS graphics from docs.
Change-Id: I50b29c89ae80ba3ae7b12dc60fee8585e17ed560
2013-03-25 18:22:20 -07:00
Fabrice Di Meglio
07eb51ece0 am 47479a55: am 04c710ad: Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev
* commit '47479a55562bb3ffc8927ab4a62de73948b1bac1':
  Fix bug #8200928 ExpandableListView should be RTL-aware
2013-03-26 00:33:26 +00:00
Fabrice Di Meglio
04c710ad9d Merge "Fix bug #8200928 ExpandableListView should be RTL-aware" into jb-mr2-dev 2013-03-26 00:27:22 +00:00
Dianne Hackborn
ac6331be6f am 8277f248: am b685faa2: Merge "Implement #8323587, #8323342, #8323590: new features." into jb-mr2-dev
* commit '8277f24865e52915b4825517860629c0385f79ed':
  Implement #8323587, #8323342, #8323590: new features.
2013-03-23 01:33:03 +00:00
Dianne Hackborn
119bbc378d Implement #8323587, #8323342, #8323590: new features.
8323587: Add feature for supporting app widgets
8323342: Add feature for replacing the home screen
8323590: Add feature for supporting input methods

The app widget service looks for the app widget feature
and refuses to work if it doesn't exist.  I didn't do
this for the input method service because some devices
will probably want to still make use of that mechanism
without supporting third party input methods.

Change-Id: Ie3b089105e104f4d767cdb03cdbe4fdb1c17382e
2013-03-22 17:27:25 -07:00
Dianne Hackborn
e9e9aa650c am c31dc858: am 1a89c532: Merge "New media button API." into jb-mr2-dev
* commit 'c31dc858488ce291f434ab8bb7b90629f7a0ce27':
  New media button API.
2013-03-22 23:20:02 +00:00
Dianne Hackborn
961cae9254 New media button API.
This allows sending media buttons to any PendingIntent,
so they can be captured with a registered receiver.

Also add some new ViewTreeObserver APIs; this is all for
a new support library API to watch media buttons while an
app has input focus.

Change-Id: I3c51cef59460662b008c9a2cc87d6a6383c21855
2013-03-22 14:49:28 -07:00
Fabrice Di Meglio
f4efad0551 Fix bug #8200928 ExpandableListView should be RTL-aware
- add indicatorStart/indicatorEnd and childIndicatorStart/childIndicatorEnd properties

Change-Id: I1ee67e47798bbcb31670cc9afde3ccac68338d94
2013-03-22 13:46:08 -07:00
Amith Yamasani
25498099e1 resolved conflicts for merge of 61b19ea1 to master
Change-Id: I0128e6ed15fdeb54b0ed81665731fcbfe76e3a0c
2013-03-21 17:37:26 -07:00
Amith Yamasani
47f1bea9da Fix merge error
Change-Id: Iec72332a45b094deaccd4e188658770aee8a61b4
2013-03-21 01:55:16 -07:00
Amith Yamasani
e32011e8c0 resolved conflicts for merge of 99755cd3 to master
Change-Id: I752c387c013c3deaad836df9b0c2294e7149a32a
2013-03-21 00:29:02 -07:00
Amith Yamasani
df2e92a535 Application restrictions API
Adds the ability for apps to export some restrictions. The restrictions
are presented in Settings based on the restriction type. The user's
selections are stored by UserManagerService and provided to the
target user's application as a list of RestrictionEntry objects which
contain the key, value(s).

Also introduce a manifest entry for system apps to request that the
app be automatically installed in all users, so that they cannot be
deselected by the owner user.

Shared account filtering for non-whitelisted apps.

Change-Id: I15b741e3c0f3448883cb364c130783f1f6ea7ce6
2013-03-20 22:29:59 -07:00
Chet Haase
44a0c8d787 am e00d5bfa: am 75dfe46e: Merge "Add auto-cancel ability to ObjectAnimator" into jb-mr2-dev
* commit 'e00d5bfaccb8674709f23d369c9d2632d824b852':
  Add auto-cancel ability to ObjectAnimator
2013-03-21 00:07:38 +00:00
Chet Haase
75dfe46e36 Merge "Add auto-cancel ability to ObjectAnimator" into jb-mr2-dev 2013-03-21 00:02:03 +00:00
ztenghui
2effb1dc55 am 39fecf19: am 1e7298b2: Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev
* commit '39fecf197ac143f50aa7aaccefd1c55f4b3055de':
  Add the orientation hint to the MediaMuxer
2013-03-20 20:57:59 +00:00
ztenghui
1e7298b250 Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev 2013-03-20 20:53:01 +00:00
Chet Haase
be19e030a1 Add auto-cancel ability to ObjectAnimator
Add a method that enables a new auto-cancel option to
ObjectAnimator. When set, any ObjectAnimator (when started) will
cause any running ObjectAnimator instance (with that flag set)
that has the same target and properties to cancel() itself prior
to starting the new one.

Issue #7426129 Add auto-cancel to animators

Change-Id: I586659c365289cdb9afb6c416bdbaf5630477149
2013-03-20 09:06:20 -07:00
Irfan Sheriff
5a55c79c55 am 169a59a8: am 63f1e2fb: Merge "Add API to control scan always mode" into jb-mr2-dev
* commit '169a59a8e2d390ff7a006dad5c54470fd284f9b0':
  Add API to control scan always mode
2013-03-20 16:03:10 +00:00
Irfan Sheriff
63f1e2fb6b Merge "Add API to control scan always mode" into jb-mr2-dev 2013-03-20 15:49:20 +00:00
ztenghui
effc9b4839 Add the orientation hint to the MediaMuxer
bug:7991013

Change-Id: I7e3e513851589e4ba7983d2c416152b2b08cbcfb
2013-03-19 13:10:25 -07:00
Elliott Hughes
d7a6958591 am d4eeaf73: am ab8278e2: am 54519e70: Fix build.
* commit 'd4eeaf73e59adad6666866a9b2adb9328af7a5af':
  Fix build.
2013-03-19 16:35:49 +00:00
Elliott Hughes
ab8278e2eb am 54519e70: Fix build.
* commit '54519e7041c9e30cefa1a175563f6a2f9bd2e478':
  Fix build.
2013-03-19 09:31:09 -07:00
Irfan Sheriff
1ef840cdc7 Add API to control scan always mode
Bug: 8141918
Change-Id: I1e5e45e514726c2cbfd86e747123e477e00fd7ed
2013-03-19 07:44:47 -07:00
Elliott Hughes
54519e7041 Fix build.
(cherry-pick of 0a65ac90fae79687b46a8e70549204b97e4c951f.)

Change-Id: Idd0feede5bf5ce78f47f9a442019e68f7717a9e4
2013-03-18 18:17:25 -07:00
Elliott Hughes
0a65ac90fa Fix build.
Change-Id: Icb7fb60f00251ab01c8f9844572bb349e45c6c41
2013-03-18 18:10:24 -07:00
Chet Haase
36350a9592 am fb38986e: am 138c58a9: Merge "Add overlays to views" into jb-mr2-dev
* commit 'fb38986e452a51b6ce37131f293316adedc75ff0':
  Add overlays to views
2013-03-18 14:34:57 +00:00