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

134199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jason Monk
56cf1ab410 Fix Global Proxy when used with PAC 
Since PAC needs to relay the local proxy port back to the
ConnectivityService it ends up calling handleApplyDefaultProxy...
This works fine for PAC on WiFi, but when tested on global proxy
(not currently used anywhere), it sets the mDefaultProxy.  This
mDefaultProxy does not get cleared when the global proxy is cleared
and requires a reboot to get things cleared out.

This CL adds a check to overwrite mGlobalProxy rather than
mDefaultProxy in this use case.

Change-Id: I92782d11e213b91f8ddda2faaf996a7252273fc3
 2014-05-08 13:46:26 -04:00
ztenghui
f563ef8102 am 3225a6b5: Further cleaning on animated part of VectorDrawable. 
* commit '3225a6b5b09c8ec78071186bfb20289600812c21':
  Further cleaning on animated part of VectorDrawable.
 2014-05-08 17:40:09 +00:00
ztenghui
ddbbb8ae85 Further cleaning on animated part of VectorDrawable. 
State changed support is gone.
Rename VAnimatedPath.
Remove the obsolete documents.
Update the tests to reflect the API changes.

Change-Id: Icdc19c6519a4e29975877c1d167e61c8fa14a371
 2014-05-08 10:16:34 -07:00
Jose Lima
729cb2391f Remove unecessary code from ActivityStack 
- Due to a previous CL to allow activities to be visible under
   the Home stack, some code un ActivityStack became unecessary.
   - This CL removes the uused code and changes the interface of
   ensureActivitiesVisibleLocked, since we no longer need to
   special case visibility for the Home stack.

Change-Id: I5cffe903bc82041fe79bfc63107df71ddf01232c
 2014-05-08 10:15:05 -07:00
Jean-Michel Trivi
04a4329b78 am 3d1cdf0a: Merge "Fix javadoc reference in AudioTrack write modes" 
* commit '3d1cdf0ab0952aa09b06de58401043de2a01a2df':
  Fix javadoc reference in AudioTrack write modes
 2014-05-08 17:10:16 +00:00
Jean-Michel Trivi
f73c8401a6 Merge "Fix javadoc reference in AudioTrack write modes" 2014-05-08 17:06:32 +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
Jean-Michel Trivi
8b520c8f8e Fix javadoc reference in AudioTrack write modes 
Javadoc for blocking/non blocking write modes was referring
 to the old signature of one of the write methods.

Change-Id: Ie919e3e0a976b0c915dacd490ae66005703789a3
 2014-05-08 17:01:40 +00:00
George Mount
764af2958b Merge "Fix mismatch in Transition ID/instances" 2014-05-08 16:58:18 +00:00
Jean-Michel Trivi
9b128af442 am 720f52c1: Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer" 
* commit '720f52c13af94e73ffcb3156a6e0a9999d017637':
  Unhide AudioTrack.write() method for non-blocking and ByteBuffer
 2014-05-08 16:04:07 +00:00
Jean-Michel Trivi
96567e2112 Merge "Unhide AudioTrack.write() method for non-blocking and ByteBuffer" 2014-05-08 15:58:46 +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
Baligh Uddin
33c08e2986 am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '825bfb4f7e9b87bf49a76d9fb43623da1df0df19':
  Import translations. DO NOT MERGE
 2014-05-08 14:43:50 +00:00
Baligh Uddin
22c782267e am af0c9964: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit 'af0c9964ee5e74d3ef0c086b6174d326941bb247':
  Import translations. DO NOT MERGE
 2014-05-08 14:43:29 +00:00
Baligh Uddin
8ac1ea8bad am 37e6e316: (-s ours) Merge "Import translations. DO NOT MERGE" 
* commit '37e6e3164e0510633765f0fbb76dc6d2760411bd':
  Import translations. DO NOT MERGE
 2014-05-08 14:43:26 +00:00
Derek Sollenberger
5b554f0103 Merge "Avoid caching shadow properties in Java & HWUI." 2014-05-08 14:41:47 +00:00
Baligh Uddin
825bfb4f7e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-08 14:37:50 +00:00
Baligh Uddin
cf501a60b8 Merge "Import translations. DO NOT MERGE" 2014-05-08 14:37:44 +00:00
Baligh Uddin
dad349ed00 Merge "Import translations. DO NOT MERGE" 2014-05-08 14:37:37 +00:00