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

78600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
4f248d0d5c am 8fcfdd39: am 255632d1: Merge "Prevent dim surface from flashing." into jb-dev 
* commit '8fcfdd39dd571dfdfb4b4fd267566761e76207fc':
  Prevent dim surface from flashing.
 2012-05-21 14:27:43 -07:00
Romain Guy
fc0c048ef4 am c301e78c: am 9579bf82: Merge "Gallery, we need to talk..." into jb-dev 
* commit 'c301e78c78188803137e2b9abfa27cd0f1ffaff5':
  Gallery, we need to talk...
 2012-05-21 14:27:40 -07:00
Mathias Agopian
100054c49d am 92432b65: am 2598a5c8: Merge "drop frame in case of error in updateTexImage" into jb-dev 
* commit '92432b65538a0eabd2621879c0327bf3e299228e':
  drop frame in case of error in updateTexImage
 2012-05-21 14:27:31 -07:00
Raphael Moll
b80866a44e am f67f834a: am 8748399f: am 61394501: Merge "Support a new ANDROID_AAPT_IGNORE env var." 
* commit 'f67f834a9cb7ee9b743e79af85cb42bd45b5aa23':
  Support a new ANDROID_AAPT_IGNORE env var.
 2012-05-21 14:27:08 -07:00
Jean-Baptiste Queru
0af2f46da7 resolved conflicts for merge of 38e34874 to master 
Change-Id: I7b8683be5a84c7c874e47876e8208a602f789320
 2012-05-21 14:22:19 -07:00
Romain Guy
68373bf484 am 1b61dc2e: am 43a760ba: Merge "Don\'t crash on Surface.unlockAndPost() but log & try again Bug #6482593" into jb-dev 
* commit '1b61dc2eb7f738bb49142db14a7d339e2fd90545':
  Don't crash on Surface.unlockAndPost() but log & try again Bug #6482593
 2012-05-21 14:12:53 -07:00
Dianne Hackborn
bd8e6f9d1c am c5fe4737: am fb5c3dba: Fix issue #6440173: MenuItem.setIcon(Drawable) scaling incorrectly... 
* commit 'c5fe47376c905e946eafbabdb78db4c128d3d71b':
  Fix issue #6440173: MenuItem.setIcon(Drawable) scaling incorrectly...
 2012-05-21 14:12:48 -07:00
Dianne Hackborn
5d9bb86367 am 9beee6ad: am d51ac09f: Merge "Fix activity resolver, issues #6519130 and #6507239" into jb-dev 
* commit '9beee6ad206541f351faad5cf30b9d0216f07d22':
  Fix activity resolver, issues #6519130 and #6507239
 2012-05-21 14:12:39 -07:00
Justin Ho
76f6efc7c7 am 321213a6: am 00d1c3a7: Merge "Updating default wallpaper." into jb-dev 
* commit '321213a6c637367d461b341af415589eced1e800':
  Updating default wallpaper.
 2012-05-21 14:12:36 -07:00
Jeff Sharkey
dc7643d84c am 40bd46ae: am 9cb660fa: Merge "Guard against apps breaking CHOOSER contract." into jb-dev 
* commit '40bd46aefde45a216ff73f8c40497a50eccdb1e0':
  Guard against apps breaking CHOOSER contract.
 2012-05-21 14:12:33 -07:00
Dianne Hackborn
891a844646 am bcb7f04a: am e312c61f: Merge "Improve fitSystemWindows() documentation." into jb-dev 
* commit 'bcb7f04a7ca05a606d1b293dbe975f1710135be7':
  Improve fitSystemWindows() documentation.
 2012-05-21 14:12:30 -07:00
Jeff Sharkey
577a2e055c am 17bee29b: am 787c9ec5: Merge "Transition from DEV network stats to XT." into jb-dev 
* commit '17bee29b1fb0c8caa90860d8b98a69e616530b44':
  Transition from DEV network stats to XT.
 2012-05-21 14:12:22 -07:00
Romain Guy
a42ea84445 am d568e4d2: am 196a7dae: Merge "Sanitize display list properties" into jb-dev 
* commit 'd568e4d2ac0ba100c91c0e24b969c6efc726172a':
  Sanitize display list properties
 2012-05-21 14:12:19 -07:00
Elliott Hughes
3a00a28ddf am a4cae284: am 4b51e293: Merge "Fix the preloaded-classes tool for JellyBean." into jb-dev 
* commit 'a4cae2847eb086742ff9d3b24a469242bd9ddae1':
  Fix the preloaded-classes tool for JellyBean.
 2012-05-21 14:12:16 -07:00
Daniel Sandler
c39b8fa901 am 5f0d6063: am 7e22a223: Merge "Updated disconnected rssi icons." into jb-dev 
* commit '5f0d6063fac445f4628feeeafbc34dab35d34966':
  Updated disconnected rssi icons.
 2012-05-21 14:12:13 -07:00
Matthew Xie
5b99700ade am fbeb8230: am dabb19fc: Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev 
* commit 'fbeb823031de2e62e11ce680b2fa5238f2e125cd':
  Increase the setup-sdp delay to cover for all the devices.
 2012-05-21 12:44:29 -07:00
Jim Miller
99c383161c am aa6e60c9: am af0a15c8: Merge "Fix 6516240: Remove unused bottom margins from owner info textview" into jb-dev 
* commit 'aa6e60c9d552cca53706ef3b759b0642357c1809':
  Fix 6516240: Remove unused bottom margins from owner info textview
 2012-05-21 12:44:22 -07:00
Jim Miller
58f062c4c0 am 45e8f3b7: am 9da2452f: Merge "Fix 6441282: confine search gesture region on tablet navbar" into jb-dev 
* commit '45e8f3b763164744216fbce6ca2360d2b566367a':
  Fix 6441282: confine search gesture region on tablet navbar
 2012-05-21 12:44:19 -07:00
Nick Pelly
2943f2aa7d am 9481259f: am 1ca43997: Merge "Enforce the minTime parameter in LocationManager#requestLocationUpdates" into jb-dev 
* commit '9481259fcb09337db00b8b39bf4709a610d77c6c':
  Enforce the minTime parameter in LocationManager#requestLocationUpdates
 2012-05-21 12:44:16 -07:00
John Reck
85712e6180 am 1f00a987: am 88b756cd: Merge "Don\'t show the touch highlight for double taps" into jb-dev 
* commit '1f00a987ac693a81cbd3739b903e981465451305':
  Don't show the touch highlight for double taps
 2012-05-21 12:44:09 -07:00
Adam Powell
c63d007fe6 am 2a6a4df9: am 93563d21: Merge "Log a warning when action bar view states cannot be restored." into jb-dev 
* commit '2a6a4df96dde5be55465816597506636bbb37cc2':
  Log a warning when action bar view states cannot be restored.
 2012-05-21 12:44:01 -07:00
Romain Guy
cc1508d0dc am 09528f96: am c8c4ced8: Merge "Call invalidate() immediately when a frame is available" into jb-dev 
* commit '09528f96f4bc5e1d7acb9c00011d232182fb93b2':
  Call invalidate() immediately when a frame is available
 2012-05-21 12:43:55 -07:00
Jim Miller
856416a20e am 3d9bf29f: am f7a44e81: Merge "Fix 6398209: Increase outer ring size for search gesture on 600dp device" into jb-dev 
* commit '3d9bf29fcf1136261bef1b2331e2d7f61c683284':
  Fix 6398209: Increase outer ring size for search gesture on 600dp device
 2012-05-21 12:43:43 -07:00
Adam Powell
a219fa6267 am 86bad548: am e2711998: Merge "New focus/activated states for the activity chooser dialog" into jb-dev 
* commit '86bad54839d9d28dbe8df7160e97a05a4a413dc5':
  New focus/activated states for the activity chooser dialog
 2012-05-21 12:43:39 -07:00
Dianne Hackborn
bad4c4bf71 am ccf4e2f7: am abe39277: Merge "Fix issue #6515427: Add android.hardware.television and fix..." into jb-dev 
* commit 'ccf4e2f71b65ace6d55c1e8513dd60b1123805da':
  Fix issue #6515427: Add android.hardware.television and fix...
 2012-05-21 12:43:35 -07:00
Jake Hamby
914994b0ab am cd9f8ea3: am 665935c1: Merge "Enable SMS short code patterns to be updated from secure settings." into jb-dev 
* commit 'cd9f8ea3beb104ba706eb315b661d1823b00fa36':
  Enable SMS short code patterns to be updated from secure settings.
 2012-05-21 12:43:28 -07:00
Svetoslav Ganov
128f15e2ca am 65e8ecf3: am a1daf827: Merge "Fix paragraph iterator." into jb-dev 
* commit '65e8ecf37b5aadf267eb5ff40b53b871f7be32d8':
  Fix paragraph iterator.
 2012-05-21 12:43:22 -07:00
Jim Miller
588532243e am 7c36dc2d: am 58a69d24: Merge "Fix 6398209: Re-enable vibrate for search gesture." into jb-dev 
* commit '7c36dc2d1e71f60de7fff3d22e2a2d9a9219bab6':
  Fix 6398209: Re-enable vibrate for search gesture.
 2012-05-21 12:43:10 -07:00
Charles Chen
828328489e am a48374db: am c6015df1: Merge "Add actions to non-JavaScript accessibility handler." into jb-dev 
* commit 'a48374db17a04f12a60e9363721769dbfff01e65':
  Add actions to non-JavaScript accessibility handler.
 2012-05-21 12:43:08 -07:00
Charles Chen
2e19d34137 am 4d39ba26: am 9a9a041c: Merge "Add movement actions to JS accessibility." into jb-dev 
* commit '4d39ba269c890e2746f439ac52d91704744c25f3':
  Add movement actions to JS accessibility.
 2012-05-21 12:43:05 -07:00
John Reck
0bbce0e8fb am ce619a96: am 3d6f7ead: Merge "Tweak show/hide of touch highlight" into jb-dev 
* commit 'ce619a9675bcb2278bf9a078fb44bb4b1d728dd3':
  Tweak show/hide of touch highlight
 2012-05-21 12:43:02 -07:00
Kenny Root
32b513850e am 8101eb7a: am ae9d040f: Merge "Wait for ASECs to be scanned before proceeding" into jb-dev 
* commit '8101eb7a74d1a65aebd33c58742fc461dcb4518f':
  Wait for ASECs to be scanned before proceeding
 2012-05-21 12:43:00 -07:00
Christopher Tate
df8532ad26 am 1f4dda28: am 27cb3f8c: Merge "Eliminate "backup enabled but not provisioned" failure modes" into jb-dev 
* commit '1f4dda280b4891c1a8aea8751f10943abdca3761':
  Eliminate "backup enabled but not provisioned" failure modes
 2012-05-21 12:42:56 -07:00
Jeff Brown
5f36ba718a am 90ab4341: am dc9445ba: Merge "Add support for grouping keyboard layouts by collection." into jb-dev 
* commit '90ab4341cf492bf80bbb90dfd6c614c65dc3c591':
  Add support for grouping keyboard layouts by collection.
 2012-05-21 12:42:53 -07:00
Bryan Mawhinney
fbc616474b am c6bbc4e7: am 9de61ae0: Merge "Fix video scaling mode validity check." into jb-dev 
* commit 'c6bbc4e70f8fe41dd31de3c8a0e9be0f24961593':
  Fix video scaling mode validity check.
 2012-05-21 12:42:50 -07:00
Jean-Michel Trivi
33cc232f74 am e215af22: am c79a9eac: Merge "New action and extra in RecognizerIntent for "hands free" voice search" into jb-dev 
* commit 'e215af22bfbb1f1322be07f43f03183daca21e93':
  New action and extra in RecognizerIntent for "hands free" voice search
 2012-05-21 12:42:46 -07:00
Michael Jurka
a6c2f8abb4 am e6733963: resolved conflicts for merge of ede4d56e to jb-dev-plus-aosp 
* commit 'e673396387466cd70d059ae75c7b069c9ced670a':
  Fix issue where static wallpaper was offset on boot
 2012-05-21 12:42:39 -07:00
Owen Lin
4405a21a6f am 5558f66e: am cb949887: Merge "Release the constraint on the requested version." into jb-dev 
* commit '5558f66efe43654c97b851b67a099df0de5429ad':
  Release the constraint on the requested version.
 2012-05-21 12:42:33 -07:00
Owen Lin
32d5bad602 am bdf6b5dd: am 61382964: Merge "Nvidia\'s patch for reusing bitmap in image region decoding." into jb-dev 
* commit 'bdf6b5dde161092e39a7c03ac17c3772f0e3701f':
  Nvidia's patch for reusing bitmap in image region decoding.
 2012-05-21 12:42:29 -07:00
Adam Powell
915d6ac088 am b3af144f: am d2cc8744: Merge "Update framework assets for switches." into jb-dev 
* commit 'b3af144ffea821be36e4aafa976c4b6225e83f86':
  Update framework assets for switches.
 2012-05-21 12:42:25 -07:00
Martijn Coenen
390d4b3c62 am 47e5794b: am d42ad1da: Merge "NFC API documentation." into jb-dev 
* commit '47e5794baa1518ed0236176d965843dfbbb851eb':
  NFC API documentation.
 2012-05-21 12:42:22 -07:00
George Mount
314fcc396f am aa5f8581: am ea1603de: Merge "Update the IME with selection and composing region changes." into jb-dev 
* commit 'aa5f858176c903e94fa8ce07f5777d4935ef3a4e':
  Update the IME with selection and composing region changes.
 2012-05-21 12:42:17 -07:00
George Mount
8d47082d8f am e0df34f6: am bb8549db: Merge "Sync the selection cursor when adjusting caret handle." into jb-dev 
* commit 'e0df34f60374ce94b409b4360504fc7d2680db53':
  Sync the selection cursor when adjusting caret handle.
 2012-05-21 12:42:13 -07:00
Jeff Brown
bb4811be3c am 031ffb15: am 7852a59d: Merge "Use FLAG_LONG_PRESS for headset long press interactions." into jb-dev 
* commit '031ffb15acb6db931488f20dc8af86864c5d5ca7':
  Use FLAG_LONG_PRESS for headset long press interactions.
 2012-05-21 12:42:10 -07:00
Irfan Sheriff
5ba27f4efe am 46579dc8: am f82e7693: Merge "handleAirplaneModeToggled cleanup" into jb-dev 
* commit '46579dc8aff0106ccf311a5679282836852f2fd9':
  handleAirplaneModeToggled cleanup
 2012-05-21 12:41:59 -07:00
Irfan Sheriff
9582f90eeb am 16cf17ce: am ce66556a: Merge "Fix persisting wifi state on setWifiEnabled() call" into jb-dev 
* commit '16cf17ce60171690526b08494482cbef4154bd96':
  Fix persisting wifi state on setWifiEnabled() call
 2012-05-21 12:41:50 -07:00
Craig Mautner
92302af1ee am a978d9bf: am d51a68b3: Merge "Eliminate deferred surface destruction." into jb-dev 
* commit 'a978d9bfefa8f7cb1591a1789effa955d902a9cf':
  Eliminate deferred surface destruction.
 2012-05-21 12:41:26 -07:00
Jesse Wilson
fc1f1d173e am 0ddb5d3b: am 9cb376e7: Merge "Change NPN to forbid empty lists of protocols." into jb-dev 
* commit '0ddb5d3b5d91ed0b891476e834de5ec4ffafece8':
  Change NPN to forbid empty lists of protocols.
 2012-05-21 12:40:41 -07:00
Jean-Michel Trivi
eafa73e4dc am 1644f0d9: am 0a95ce9f: Merge "Handle media button events during phone calls and when ringing" into jb-dev 
* commit '1644f0d9ee72cf37f0b92a7b5ef44bfac1421bab':
  Handle media button events during phone calls and when ringing
 2012-05-21 12:40:38 -07:00
Daniel Sandler
5678460218 am 94496d57: am cb5ed06a: Merge "Hide the expanded status bar view when not in use." into jb-dev 
* commit '94496d5741c739743033207255fc155d46a5bca8':
  Hide the expanded status bar view when not in use.
 2012-05-21 12:40:31 -07:00