Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,194 Commits 3 Branches 0 Tags
baabe3ecc287373d030800f65b30447b98755706
Commit Graph

39379 Commits

Author SHA1 Message Date
Yohei Yukawa
baabe3ecc2 am e6d58c4c: Merge "Introduce new API for floating window support" 
* commit 'e6d58c4ce6dedc082cbc13aa494e793a78022aa6':
  Introduce new API for floating window support
 2014-05-09 10:47:09 +00:00
Yohei Yukawa
2ac9979179 Merge "Introduce new API for floating window support" 2014-05-09 10:43:44 +00:00
Yohei Yukawa
c2ddd60236 Introduce new API for floating window support 
This CL introduces a new API IMM#updateCursorAnchorInfo for
floating window support.

BUG: 14579622
Change-Id: I61dec2f8fa671ba891da1d4af08975750e3acb04
 2014-05-09 19:17:15 +09:00
Jessica Hummel
5a2e76a4e0 am 690022d1: Merge "Add api for getting the parent of a profile." 
* commit '690022d14be0251b6e618b01e3f448cb49e61241':
  Add api for getting the parent of a profile.
 2014-05-09 09:38:45 +00:00
Jessica Hummel
a8c5f577d0 Merge "Add api for getting the parent of a profile." 2014-05-09 09:33:28 +00:00
Ashish Sharma
29e832bcce am b87cf3a0: Bump the batterystats checkin stats version number. 
* commit 'b87cf3a06618d67ec37a299a385f80466b72d9bd':
  Bump the batterystats checkin stats version number.
 2014-05-09 02:09:11 +00:00
Ashish Sharma
bffcf1c2da Bump the batterystats checkin stats version number. 
Change-Id: Ie403b89022e4d1f6ad0e07e70c95f39a1d5fa530
 2014-05-09 02:03:55 +00:00
Michael Wright
dfeab22a1e am 86d53d01: Merge "Temporarily remove the dpad keys from system keys." 
* commit '86d53d0107e829c537490c97700397452c728556':
  Temporarily remove the dpad keys from system keys.
 2014-05-09 00:33:32 +00:00
Michael Wright
786efab54d Merge "Temporarily remove the dpad keys from system keys." 2014-05-09 00:28:59 +00:00
Martijn Coenen
66f29aa4a5 am 5aa45ef5: Merge "HCE/SE foreground support." 
* commit '5aa45ef5ce6725638425aeeec29ac456f326d4c9':
  HCE/SE foreground support.
 2014-05-08 23:37:00 +00:00
Martijn Coenen
781a83878a Merge "HCE/SE foreground support." 2014-05-08 23:33:51 +00:00
Michael Wright
7c1c71e27b Temporarily remove the dpad keys from system keys. 
Bug: 14438911
Change-Id: Ibb58a4af89585b6e266f5236df22f0465dd17bd4
 2014-05-08 16:14:11 -07:00
Winson Chung
9194acc50f am 12c9e3a0: Merge "Removing the old tasks on launching recents task if they trigger a new task." 
* commit '12c9e3a00bf912167d1c40a356d19301c93bfdd0':
  Removing the old tasks on launching recents task if they trigger a new task.
 2014-05-08 22:38:15 +00:00
Winson Chung
6e05841950 Merge "Removing the old tasks on launching recents task if they trigger a new task." 2014-05-08 22:33:20 +00:00
Dianne Hackborn
d9225ba404 am 60549e20: Merge "Usage stats!" 
* commit '60549e202fd57679b0ead98224264c3308106ebd':
  Usage stats!
 2014-05-08 22:04:02 +00:00
Dianne Hackborn
6af7d62df8 Merge "Usage stats!" 2014-05-08 21:58:45 +00:00
Eino-Ville Talvala
0a7540c53a am 59969600: Merge "Add android.hardware.camera.external feature." 
* commit '599696000400582773dcff7b6142b603ef68ec6b':
  Add android.hardware.camera.external feature.
 2014-05-08 21:50:32 +00:00
Svetoslav
bbe22eb8d3 am a026d635: PrintManager should not crash if print fueature is not available. 
* commit 'a026d63594fafaae046ec97dede2a6a3ed961e66':
  PrintManager should not crash if print fueature is not available.
 2014-05-08 21:50:28 +00:00
Eino-Ville Talvala
2e58d6de06 Merge "Add android.hardware.camera.external feature." 2014-05-08 21:33:49 +00:00
Svetoslav
2235a1772f PrintManager should not crash if print fueature is not available. 
Printing is one of the optional software features. If the device does not
have the feature, then the print APIs should do nothing. Before, a NPE
crash was happening.

bug:14651902

Change-Id: I63efa75be51e8957ca6854b2b439918f01c0f154
 2014-05-08 14:25:51 -07:00
Winson Chung
5393dff555 Removing the old tasks on launching recents task if they trigger a new task. 
- Only kill processes when removing tasks that are not started as documents
- Tweaking thumbnail animation
 2014-05-08 14:25:43 -07:00
Jessica Hummel
be81c800ae Add api for getting the parent of a profile. 
Change-Id: Ife59665cdf6531a118d74def864c8cfc92c92a42
 2014-05-08 14:17:07 -07:00
Dianne Hackborn
e22b3b1432 Usage stats! 
Start reworking the usage stats service to be able
to have an API we can publish.

The basic information it keeps is still the same, though
that will be changing in the future.  The one big addition
here is that we are also now collecting configuration usage
stats.

Also introduce the start of an access model for usage stats,
using app ops.  There is an new app op that gives an application
access to usage stats even if it normally wouldn't have it,
disabled by default.

Change-Id: I6ead28e18a7f08eafd057d6ff37dd9cb216358f4
 2014-05-08 13:58:13 -07:00
justinzhang
a0111698d4 am 3bd2ec0f: Merge "DevicePolicyManager Authentication for Lock Task" 
* commit '3bd2ec0f88c4c52ba6470c8b1d06b85ac39c3adc':
  DevicePolicyManager Authentication for Lock Task
 2014-05-08 20:38:45 +00:00
justinzhang
ed32c842c6 Merge "DevicePolicyManager Authentication for Lock Task" 2014-05-08 20:35:12 +00:00
Emily Bernier
530f133a3f am f5a4eabb: Merge "New user restrictions for EDU" 
* commit 'f5a4eabbd7531271f523cd326e2b1d0a449b1168':
  New user restrictions for EDU
 2014-05-08 19:55:39 +00:00
Emily Bernier
86e8029079 Merge "New user restrictions for EDU" 2014-05-08 19:51:50 +00:00
Craig Mautner
662274281a am acf92242: Merge "Make ChooserActivity intents doccentric and transitory" 
* commit 'acf922428803d5a6b619254df0daa3a724580970':
  Make ChooserActivity intents doccentric and transitory
 2014-05-08 19:48:58 +00:00
Craig Mautner
7486ae202f Merge "Make ChooserActivity intents doccentric and transitory" 2014-05-08 19:44:53 +00:00
Craig Mautner
411d2aed2b Make ChooserActivity intents doccentric and transitory 
Activities launched from the chooser activity will now appear in
their own tasks which will be automatically removed from recents
when they are finished.

Also qualified application of new flags with null check and
Action check. Must be either ACTION_SEND or ACTION_SEND_MULTIPLE.

Fixes bug 14463859.
Fixes bug 14633773.

Change-Id: I8832462163958f6a43bc4c6a020f78948ce70ac3
 2014-05-08 12:43:50 -07:00
justinzhang
511e0d8323 DevicePolicyManager Authentication for Lock Task 
Here we let DevicePolicyManager keep a list of tasks that are
allowed to start the lock task mode. This list can only be set by
a device owner app. The ActivityManager will call
DevicePolicyManager to check whether a given task can start the
lock task mode or not.

Change-Id: I650fdae43fc35bf9fd63452283f4e2bbadd11551
Bug: 14611303
 2014-05-08 15:00:14 -04:00
Eino-Ville Talvala
9131da28e1 Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 11:53:01 -07:00
Selim Gurun
635afd0a80 am f60667b1: Merge "Cleanup a unused setting" 
* commit 'f60667b17423fbf1e03fe26ca04e012391034219':
  Cleanup a unused setting
 2014-05-08 18:51:42 +00:00
Selim Gurun
6cab9b3814 Merge "Cleanup a unused setting" 2014-05-08 18:48:52 +00:00
Mindy Pereira
048a3f6659 am 68a68949: am 101e3793: am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 
* commit '68a6894950c210e9ad9300a16acb5870b13c124f':
  Make distance count when dismissing swipedismisslayout
 2014-05-08 18:36:41 +00:00
Selim Gurun
57cee39d76 Cleanup a unused setting 
The old webview is not used anymore. Removing this setting.

Change-Id: I3f783eec195a2f11534bcff8243ce4d2c556a416
 2014-05-08 11:35:25 -07:00
Mindy Pereira
a3ef079aaf am 101e3793: am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 
* commit '101e379318a3869f64ea897a3f95a89243408c94':
  Make distance count when dismissing swipedismisslayout
 2014-05-08 18:30:57 +00:00
George Mount
0b73f3f9b1 am ec33d3be: Merge "Fix mismatch in Transition ID/instances" 
* commit 'ec33d3bed626da72f98b00bc7f927c58072f030d':
  Fix mismatch in Transition ID/instances
 2014-05-08 17:03:29 +00:00
George Mount
764af2958b Merge "Fix mismatch in Transition ID/instances" 2014-05-08 16:58:18 +00:00
Derek Sollenberger
2714bdfdc1 am a5e12a42: Merge "Avoid caching shadow properties in Java & HWUI." 
* commit 'a5e12a4227d6ef1efd4f17697f407d165a992a72':
  Avoid caching shadow properties in Java & HWUI.
 2014-05-08 14:47:34 +00:00
Derek Sollenberger
5b554f0103 Merge "Avoid caching shadow properties in Java & HWUI." 2014-05-08 14:41:47 +00:00
Sander Alewijnse
12fa1fe307 am 7d5cd652: Merge "Add API to disable account management for certain types of accounts." 
* commit '7d5cd65262c9a5735f660e05ce89a02f2d28be14':
  Add API to disable account management for certain types of accounts.
 2014-05-08 12:52:50 +00:00
Sander Alewijnse
5c082dd22f Merge "Add API to disable account management for certain types of accounts." 2014-05-08 12:49:10 +00:00
Dan Sandler
fea08f22de am 20d80a4a: Merge "Quantum notification improvements." 
* commit '20d80a4a05249fca9f4aa6c80b61a1f7a9e18dd0':
  Quantum notification improvements.
 2014-05-08 11:34:31 +00:00
Dan Sandler
b325c80d3d Merge "Quantum notification improvements." 2014-05-08 11:30:46 +00:00
Sander Alewijnse
5c02db60be Add API to disable account management for certain types 
of accounts.

The account types with disabled account management are stored in a
blacklist in the active admin object, editable by profile owners.

Change-Id: I57dc5f709ad79674fa28dd006969283585daea24
 2014-05-08 12:28:07 +01:00
Vinit Deshapnde
558322e093 am 26e8778f: Merge "Remove reference to WifiScanner till the API is made public" 
* commit '26e8778f58a8ccf8c73ae16cd30e05515438496e':
  Remove reference to WifiScanner till the API is made public
 2014-05-08 10:10:00 +00:00
Vinit Deshapnde
256daf0093 Remove reference to WifiScanner till the API is made public 
Change-Id: I0cb2be4338ce59e1d12f83a94edc5de39810b18a
 2014-05-08 02:45:12 -07:00
Vinit Deshapnde
6f5494c749 am c5fe3c17: Merge "Initial implementation of WifiScanner" 
* commit 'c5fe3c179c9f82cacaf0ac082f49de9f9c31708c':
  Initial implementation of WifiScanner
 2014-05-08 08:45:04 +00:00
Vinit Deshapnde
b788d4eb01 Merge "Initial implementation of WifiScanner" 2014-05-08 08:22:59 +00:00