drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134,319 Commits 1 Branch 0 Tags
Commit Graph

134319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
6af7d62df8 Merge "Usage stats!" 2014-05-08 21:58:45 +00:00
Chris Wren
3783169c10 am f8e933f9: am 2dc97d48: am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit 'f8e933f9882e7ee627c7189e4ab650a20531e58a':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:50:47 +00:00
Baligh Uddin
8b69992717 am befca9de: (-s ours) am 33c08e29: (-s ours) am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'befca9de237cf212962b62b184d8f14a944962da':
  Import translations. DO NOT MERGE
 2014-05-08 21:50:44 +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
1caeb10a7a DO NOT MERGE: 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 21:47:36 +00:00
Chris Wren
201f9b8d49 am 2dc97d48: am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '2dc97d48b924e0ea196404d5adbe5084b344d25e':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:43:13 +00:00
Baligh Uddin
3153c179d8 am 33c08e29: (-s ours) am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '33c08e2986832fa32fc08350f946e7c2e8f2b3a6':
  Import translations. DO NOT MERGE
 2014-05-08 21:42:00 +00:00
Eino-Ville Talvala
2e58d6de06 Merge "Add android.hardware.camera.external feature." 2014-05-08 21:33:49 +00:00
Chris Craik
e10e827ed6 Rename matrices for consistency 
The projection matrix no longer contains viewing transformation, and
has thus been renamed.

Change-Id: I4f85ccdac97f4cb4f987bb05c389816680f1c94f
 2014-05-08 14:28:26 -07: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
Chris Craik
53a320c127 am db8807e0: Merge "Add logging utility methods" 
* commit 'db8807e06c1a1ea7f101843b8e2d7562800113d0':
  Add logging utility methods
 2014-05-08 21:18:04 +00:00
Jessica Hummel
be81c800ae Add api for getting the parent of a profile. 
Change-Id: Ife59665cdf6531a118d74def864c8cfc92c92a42
 2014-05-08 14:17:07 -07:00
Chris Craik
5553295d18 Merge "Add logging utility methods" 2014-05-08 21:13:07 +00:00
Chris Wren
2dc97d48b9 am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '90abb78b51a35055f86dee35c4e391e74f325125':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:08:24 +00:00
Chris Wren
90abb78b51 am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '678f7edd140f3914655bc600d207d3dcb986f881':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:03:04 +00:00
Chris Wren
678f7edd14 Merge "Avoid SystemUI crash due to NPE" 2014-05-08 21:00:21 +00: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
Chris Craik
e4aa95e362 Add logging utility methods 
Change-Id: I0f316830dcc0bbf438292a6d0fbe9f8154368500
 2014-05-08 13:57:05 -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
Jeff Brown
80f64f2555 am b6398522: Merge "Improve documentation of setOnFrameAvailableListener." 
* commit 'b6398522f3d1972fa12cc601de717725fd5afa0a':
  Improve documentation of setOnFrameAvailableListener.
 2014-05-08 20:28:33 +00:00
Jeff Brown
3b1ae5e40b Merge "Improve documentation of setOnFrameAvailableListener." 2014-05-08 20:22:46 +00:00
Jeff Brown
ba873d2171 Improve documentation of setOnFrameAvailableListener. 
Change-Id: I970e5941f3f6975a284d18056238a6877c7acbf2
 2014-05-08 13:21:27 -07:00
Dan Sandler
6236fc149f am 705da2d6: Merge "Don\'t show notifications above FLAG_SHOW_WHEN_LOCKED windows." 
* commit '705da2d6ffe0fec9f292885a02a07238f598e3fd':
  Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows.
 2014-05-08 19:59:35 +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
Dan Sandler
12319badd6 Merge "Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows." 2014-05-08 19:55:25 +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
Dan Sandler
3806c77133 Don't show notifications above FLAG_SHOW_WHEN_LOCKED windows. 
We need to hide the bouncer when the lockscreen is occluded
by a show-when-locked window, but we also need to double-check
any time the screen comes on in case the bouncer has been
shown for some other reason since the occlusion originally 
happened.

Bug: 14294001
Change-Id: Ief4ea8e39322d9c4b26ec217dbc14b6c6f16ad45
 2014-05-08 19:46:42 +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
Winson Chung
191b7c503b am 73d8eb03: Merge "Listening for system changes to active recent tasks. (Bug 14260718)" 
* commit '73d8eb0399fd041e24b2402c0cb9f04f6845ad6b':
  Listening for system changes to active recent tasks. (Bug 14260718)
 2014-05-08 19:42:17 +00:00
Winson Chung
8f17b57582 Merge "Listening for system changes to active recent tasks. (Bug 14260718)" 2014-05-08 19:37:19 +00:00
Jose Lima
bcaf921b8e am c892fdc7: Merge "Remove unecessary code from ActivityStack" 
* commit 'c892fdc7f484f1c0cb15fb415f1ac76b3b496694':
  Remove unecessary code from ActivityStack
 2014-05-08 19:01:51 +00: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
Jose Lima
ca0c0ba764 Merge "Remove unecessary code from ActivityStack" 2014-05-08 18:56:53 +00: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
Ying Wang
f42c5b532c am 90e2de4a: am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '90e2de4a0548413d2ea6f8c108a3299d06248f4d':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:36:45 +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
dmitrygr@google.com
bfba77c005 am 026d35e4: am 90cfa001: (-s ours) resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp 
* commit '026d35e49cc40a88ab135ac6994b7c57533bab79':
  DO NOT MERGE: change preloaded classes
 2014-05-08 18:36:37 +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
Ying Wang
29894c6176 am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 18:31:18 +00: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
dmitrygr@google.com
99350faf73 am 90cfa001: (-s ours) resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp 
* commit '90cfa0011243b5461644f4182a0d76d63e41610d':
  DO NOT MERGE: change preloaded classes
 2014-05-08 18:30:53 +00:00
Jason Monk
e4a6371797 am c2337cda: Merge "Fix Global Proxy when used with PAC" 
* commit 'c2337cda072ea9cffbdfa6004aad9d4507a91632':
  Fix Global Proxy when used with PAC
 2014-05-08 17:58:56 +00:00
Jason Monk
a2604b738e Merge "Fix Global Proxy when used with PAC" 2014-05-08 17:52:58 +00:00