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

134381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Selim Cinek
448b52ec3b am 155f9087: Merge "Improved animation logic of the new notifications" 
* commit '155f908763480fe60363f5f4f6bf85e60f31a6ce':
  Improved animation logic of the new notifications
 2014-05-08 13:38:40 +00:00
Selim Cinek
695015dd11 Merge "Improved animation logic of the new notifications" 2014-05-08 13:35:03 +00:00
Selim Cinek
8df56452cb Improved animation logic of the new notifications 
Scrolling and other local updates work much better now when an
animation is already in place.

Change-Id: I602899bc75ae132ebb30591e723be3f00f744e18
 2014-05-08 15:25:40 +02:00
Jorim Jaggi
8e812b74cb am 96428eed: Merge "Fix crash in ActivatableNotificationView." 
* commit '96428eed59d74368f2c47f12bdd2a8729888a545':
  Fix crash in ActivatableNotificationView.
 2014-05-08 13:09:30 +00:00
Jorim Jaggi
11b7a38139 Merge "Fix crash in ActivatableNotificationView." 2014-05-08 13:04:34 +00:00
Jorim Jaggi
bccb9123a5 Fix crash in ActivatableNotificationView. 
Change-Id: Ifc431333bcf0b0d2ade81730c9ffc935218e5cc0
 2014-05-08 15:04:10 +02:00
Kenny Guy
71f42d6a7a am 61b99613: Merge "Limit package launcher apps callback to enabled users." 
* commit '61b996134da3c5b04a6f442ad6e1d80dd7f8a5ac':
  Limit package launcher apps callback to enabled users.
 2014-05-08 12:58:05 +00:00
Kenny Guy
26ecbefea0 Merge "Limit package launcher apps callback to enabled users." 2014-05-08 12:54:39 +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
Amith Yamasani
219ccc3b35 am 776e9894: Merge "Send boot_completed for users started in the background" 
* commit '776e98945f482e1e1be4e04d3e835c691142032f':
  Send boot_completed for users started in the background
 2014-05-08 12:25:20 +00:00
Amith Yamasani
63812fd9f2 Merge "Send boot_completed for users started in the background" 2014-05-08 12:22:02 +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
Neil Fuller
34a6418cba am a05be305: Merge "Unhide further 1.7-era APIs" 
* commit 'a05be305825501bdfc7fe812d675cc86d1cae221':
  Unhide further 1.7-era APIs
 2014-05-08 10:32:32 +00:00
Neil Fuller
37a61c5e84 Merge "Unhide further 1.7-era APIs" 2014-05-08 10:28:25 +00:00
Christoph Studer
ec9dad8ccd am 5fe09365: Merge "Record notification events to a local SQLite DB" 
* commit '5fe09365d8a6669e688ae3c705e4abb9d6d9e0db':
  Record notification events to a local SQLite DB
 2014-05-08 10:25:41 +00:00
Christoph Studer
5dfbe24fc4 Merge "Record notification events to a local SQLite DB" 2014-05-08 10:21:14 +00: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