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

158042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav
ffec747bec am 01243f18: am 7d3db59d: am 59d0713d: Merge "Fix back button behavior and clean up in print preview activity." into lmp-dev 
* commit '01243f18f8530062d8a57158de4a1e47e24d1cf1':
  Fix back button behavior and clean up in print preview activity.
 2014-09-12 19:24:21 +00:00
Ihab Awad
560d161314 am 7f29c5ef: am 7746d2c5: am 0bf3d66d: Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev 
* commit '7f29c5ef8123c46343e5d700520e9cd0579b281b':
  Change UI to represent conferenced IMS connections (1/3)
 2014-09-12 19:24:16 +00:00
Adam Powell
6e9f8a7be1 am 9854feaf: am e82480b3: am 51eee88c: Merge "Remove View methods that can\'t be used safely from the SDK" into lmp-dev 
* commit '9854feaf50aeae95adfa1a70e037a95d4cd3b85d':
  Remove View methods that can't be used safely from the SDK
 2014-09-12 19:24:10 +00:00
Craig Mautner
72c781d7d0 am 2df97e5f: am 2c85b1fc: am 790a059b: Merge "If activity is an alias get maxRecents from target" into lmp-dev 
* commit '2df97e5f112ac74e34cf7ec243c1e37b4b1fd921':
  If activity is an alias get maxRecents from target
 2014-09-12 19:24:05 +00:00
Jeff Davidson
4dd5383175 am 1cb2e760: am bf2ac88f: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev 
* commit '1cb2e7603e13c23594b5a03b56f2fafd09d94c38':
  Update VpnService Javadoc to reflect new UX.
 2014-09-12 19:24:00 +00:00
Craig Mautner
d9a1b83937 am 827fda41: am c7617201: am 7f97f2c3: Merge "Add null check to TaskPersister file list." into lmp-dev 
* commit '827fda41ea2b90d74098ca5be9eb4df3c91bde14':
  Add null check to TaskPersister file list.
 2014-09-12 19:23:54 +00:00
Prerepa Viswanadham
8e91c94ca0 am a4a6bca6: am 0d8efe53: am 041299e3: Remove onConnectionCongested callback 
* commit 'a4a6bca675df63115b52e7a16aebbdd6beb59657':
  Remove onConnectionCongested callback
 2014-09-12 19:23:47 +00:00
Jeff Brown
80022ca34b am 644c809c: am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev 
* commit '644c809cd01e09891a464752347112d437e62ca6':
  Clean entire arg block when setting process name.
 2014-09-12 19:23:42 +00:00
Svet Ganov
a534ebbbf4 am 2e216abb: am 6e0f0619: am 60d4306b: Merge "Fix edit text error state in the print UI." into lmp-dev 
* commit '2e216abb8ee1e65a731122df5679f74fdd1873d0':
  Fix edit text error state in the print UI.
 2014-09-12 19:23:37 +00:00
George Mount
e799cd44e0 am d28671db: am b9a2399e: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev 
* commit 'd28671db218886b24ca3fe38ad8446fdef04b5dc':
  Fixed: TransitionSet setStartDelay did nothing.
 2014-09-12 19:23:31 +00:00
George Mount
bc12aa06e0 am 9c663fcf: am 9ace814b: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev 
* commit '9c663fcfb9efc4313bcaf57ee52d207bd2c4ea35':
  Have Activity Transitions activited by a new window attribute.
 2014-09-12 19:23:26 +00:00
George Mount
35d7960cb2 am 70005d59: am 217e34d0: am 51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev 
* commit '70005d594f263b964086db6b61d1fa7510f114ee':
  Allow Path approximation to work with a single point Path.
 2014-09-12 19:23:20 +00:00
Igor Murashkin
67335343f4 am 0682190b: am 5d2587c3: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev 
* commit '0682190b025b5039567532de2a752a00e7c20977':
  camera2.legacy: Add aberration, noisereduction, timestamp source keys
 2014-09-12 19:23:15 +00:00
Sreeram Ramachandran
dd6ecbaaee am 2b3b6875: am 6e06689c: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev 
* commit '2b3b68753f4bb2231d9a17393fdfeac93a1b24c0':
  Hide mutable VpnService APIs to add/remove IP addresses dynamically.
 2014-09-12 19:23:08 +00:00
Andrew Lee
cc004e1aaf am 5e1e02bb: am ed7850b0: am a523c405: Merge "API cleanup for RemoteConnection." into lmp-dev 
* commit '5e1e02bbfa7a0be98a986fe2114f236502c27a24':
  API cleanup for RemoteConnection.
 2014-09-12 19:23:02 +00:00
Eric Rowe
39a3d8f8fa am c69fdba7: am d6b27382: am 92168d44: Merge "Fix wifi association tests" into lmp-dev 
* commit 'c69fdba7d96e32d008d148933ca5e2520947c265':
  Fix wifi association tests
 2014-09-12 19:22:57 +00:00
Anthony Lee
1db943197b am d1155b23: am 821b1df1: am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev 
* commit 'd1155b23b3e5d49669462a5f687a0966d72b7ede':
  isValidSlotId() and isValidPhoneId() updated to handle negatives.
 2014-09-12 19:22:52 +00:00
ztenghui
5b447e1d28 am e1aea57f: am 7c23eaa7: am 0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev 
* commit 'e1aea57fdd6477b5871cd3c24acac2f5d82c88a4':
  Finer tessellation can draw better looking shadows for circles.
 2014-09-12 19:22:46 +00:00
vandwalle
98ed2262e1 am 3cf637e4: am 5bb3b182: am c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev 
* commit '3cf637e4b07ffe997f418d6c42da7864d33f029f':
  add option to link only same credential configurations
 2014-09-12 19:22:41 +00:00
Christopher Tate
a27199ae8a am f87e80f6: am 55b0fbea: am e32b2a5d: Merge "Write new wallpaper files from scratch..." into lmp-dev 
* commit 'f87e80f60ba5f9bfcbf1239b338e55d6e4b138ba':
  Write new wallpaper files from scratch...
 2014-09-12 19:22:35 +00:00
Nancy Chen
ad1cd9cbae am b89f4079: am a7766a4b: am 03ee9f82: Merge "Update TelecommManager per API requirements. (1/3)" into lmp-dev 
* commit 'b89f40791bf48e2b9e89ffe04830d42ca05e8e19':
  Update TelecommManager per API requirements. (1/3)
 2014-09-12 19:22:29 +00:00
Chris Craik
079bffd015 am c87972fc: am 5707b4c6: am e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev 
* commit 'c87972fceab38aaf1757cc756291f3a32064294e':
  Update HWUI paint filter to understand new location of skia bitmap filter preference
 2014-09-12 19:22:25 +00:00
Michael Wright
dfb309b870 am b04d7260: am 4b5e1fbe: am 54bc6182: Change callback methods from add to register. 
* commit 'b04d72602b06aa33034b17c9f29b8abba34644c5':
  Change callback methods from add to register.
 2014-09-12 19:22:19 +00:00
Chet Haase
3e2ff75f7b am 4280132f: am e58831a6: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev 
* commit '4280132f44a20d42cffd436d8eab7653c82b3249':
  Make starting window hw-accelerated
 2014-09-12 19:22:14 +00:00
Xin Guan
39e1e5fcdd am fa4050ca: am dcfbab57: am 314712e9: Temp enable the log to identify the wake up cause. 
* commit 'fa4050cad871428b98f7449ef981e730d8184644':
  Temp enable the log to identify the wake up cause.
 2014-09-12 19:22:09 +00:00
Paul Lawrence
b2c3585135 am c1aa9012: am 1d255e2d: am 5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev 
* commit 'c1aa9012a97d9120d40062ada3abbebca8dab906':
  Create correct files in dropbox on encrypted boot
 2014-09-12 19:22:04 +00:00
Robin Lee
d3cf89a532 am 651dc502: am 3da67a7a: am 7ac7a7d8: Update API 
* commit '651dc5026d0abeff0a04c1563c72152c2ef2a727':
  Update API
 2014-09-12 19:21:59 +00:00
Marcin Kosiba
5e747beb43 am 6fc0dcd3: am 972628dc: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev 
* commit '6fc0dcd393eea224e770e8c1feab749dc56c1bfd':
  Don't use reflection when generating the onResourcesLoaded callback.
 2014-09-12 19:20:50 +00:00
John Spurlock
40a414bb26 am 89fdea38: am 33386490: am 5d77d533: Merge "Doze: Introduce a pulse period function." into lmp-dev 
* commit '89fdea38becbd056ba798541bec709683a1afe32':
  Doze: Introduce a pulse period function.
 2014-09-12 19:20:45 +00:00
Nancy Chen
f59044b560 am 4caddb10: am 4d4b7ee6: am 63a12357: Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev 
* commit '4caddb10f5e9392ef0f60f3274d0e9d1236b7c19':
  Make changes to Connection in Telecomm API (1/4)
 2014-09-12 19:20:40 +00:00
Alan Viverette
2d6d14deb0 am a56d7668: am bff3a6cf: am f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev 
* commit 'a56d7668bb5705688cecdaad31af6644e7b4beb4':
  Enable adjustViewBounds on preference icon so that maxWidth is used
 2014-09-12 19:19:31 +00:00
Robin Lee
e5c0bc9530 am 7ee71d8a: am ac988bd9: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev 
* commit '7ee71d8a7be25bea6b66b26898945b27dffb3af6':
  Add DevicePolicyManager PrivateKey mgmt
 2014-09-12 19:19:24 +00:00
Jean-Michel Trivi
2d1cf3c310 am 2b365e11: am 6b3b63e2: Merge "AudioService: modify stream delay for touch exploration" into lmp-dev 
* commit '2b365e11d1b837efac19c30e42226c357c273590':
  AudioService: modify stream delay for touch exploration
 2014-09-12 19:19:20 +00:00
RoboErik
e8ea965a1d am c8ee3532: am d898ddba: am 6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev 
* commit 'c8ee353245bee076899107e495f57457eba216ef':
  Update text appearance in leanback setup
 2014-09-12 19:19:18 +00:00
Jorim Jaggi
4089afe9ed am 6791ad68: am 733bf7bd: Merge "Attempt to fix invisible Keyguard #2" into lmp-dev 
* commit '6791ad68c8e325fe330e495d10bdf86efa0450de':
  Attempt to fix invisible Keyguard #2
 2014-09-12 19:19:15 +00:00
Vinit Deshpande
d9039becc4 am 81bc42f2: am 81c30ffd: am 279e0cc4: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev 
* commit '81bc42f2ea08d3e916f146ec14eb38e885de0764':
  Don't require CONNECTIVITY_INTERNAL check for protected broadcasts
 2014-09-12 19:19:12 +00:00
Chris Craik
7f00c69b7c am c168393b: am 3fd1ada4: Merge "Disable layer leak tracking" into lmp-dev 
* commit 'c168393b3ba99721be2c2d9629d687431aa6b9e0':
  Disable layer leak tracking
 2014-09-12 19:19:10 +00:00
Amith Yamasani
561974e765 am 62ff70d0: am 0ec5511e: am 4fa40b32: Fix build 
* commit '62ff70d069835eb9d02fe20943cbbd6d930fba1e':
  Fix build
 2014-09-12 19:19:07 +00:00
Marcin Kosiba
26dd49f4c1 am 6e6ae86a: am 46683a27: Remove an @removed member of andorid.webkit.WebResourceResponse. 
* commit '6e6ae86a8659a02e30bdf1a9ec4ca910c4a78215':
  Remove an @removed member of andorid.webkit.WebResourceResponse.
 2014-09-12 19:19:04 +00:00
Svetoslav
2fec710ebe am b7f151ad: am ec8399cd: am dd18a7f7: Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev 
* commit 'b7f151ad9eb91d2191cd1cb15f337b1bd2bc89dd':
  Windows for accessibility with wrong coords on rotation.
 2014-09-12 19:19:01 +00:00
Cheuksan Wang
9d0f4c537f am 249ef14b: am 59c04032: Merge "Send and download MMS via content provider instead of PDU bytes." into lmp-dev 
* commit '249ef14bb9527cc563483eeb3afabcdca6a16da2':
  Send and download MMS via content provider instead of PDU bytes.
 2014-09-12 19:18:58 +00:00
Vineeta Srivastava
8431236c18 am f1b25e21: am 758fb0cb: am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev 
* commit 'f1b25e2107f445deebd9ed9b5178b9f82e2311c3':
  Send empty flash for some CDMA carriers for 3way call
 2014-09-12 19:18:56 +00:00
Christoph Studer
e04e61b28c am ece217e9: am ebdd94ba: Merge "NoMan: Refresh ManagedServices on user switch" into lmp-dev 
* commit 'ece217e9c8903ed8545663bce1293d33e653888b':
  NoMan: Refresh ManagedServices on user switch
 2014-09-12 19:18:53 +00:00
Matthew Williams
b0b0b7fd30 am f94a6a7c: am 04f538e8: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev 
* commit 'f94a6a7c55682d634b4d0f9a1184afe57d18f3c4':
  Add flag to JobParameters for job expired
 2014-09-12 19:18:50 +00:00
Sander Alewijnse
fc27bbc043 am a0b249b2: am 4d9fe6d1: Merge "Rename email extra." into lmp-dev 
* commit 'a0b249b28ea08044287a4a3558e538ab766312b3':
  Rename email extra.
 2014-09-12 19:18:48 +00:00
Tyler Gunn
ec83bc514a am 170694a5: am a99279fe: am ba740d4f: Allowing enable/disable of phone accounts. (1/3) 
* commit '170694a5d8803e26b35bbeba63b0add9e6f2191a':
  Allowing enable/disable of phone accounts. (1/3)
 2014-09-12 19:18:45 +00:00
Alexandra Gherghina
272d79c715 am 92f8d577: am 443a5766: Merge "Assign default icon to users at creation time and in SystemUI." into lmp-dev 
* commit '92f8d577c50a54e8375435813096b997d58cd368':
  Assign default icon to users at creation time and in SystemUI.
 2014-09-12 19:18:43 +00:00
Yohei Yukawa
6abab87a03 am e3e136ab: am 981f7904: Merge "Enrich test cases when enabling default IMEs part 4" into lmp-dev 
* commit 'e3e136abaecbd088032891088c9e1e7f4a63addd':
  Enrich test cases when enabling default IMEs part 4
 2014-09-12 19:18:39 +00:00
Nancy Chen
bf7bf467d9 am d048afca: am f05b8506: am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev 
* commit 'd048afca82398e694d1089fea7861d03843be815':
  API changes in GatewayInfo, Response, and PropertyPresentation (1/4)
 2014-09-12 19:18:39 +00:00
Jon Larimer
4040e06603 am 47525971: am 114423ee: am 92d7b9a6: am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev 
* commit '47525971e9eb34918d27b0c5d7c0db86d9bee218':
  Fix issue #16794553: Duplicate ArrayMap entries in Bundle...
 2014-09-12 19:18:35 +00:00