ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
35,072 Commits 2 Branches 0 Tags 54 MiB
51a2ab51bd
Commit Graph

35072 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
e7bf0322d2 Merge "Break apart queries to getInstalled* API DO NOT MERGE" into honeycomb-mr2 2011-05-26 13:10:23 -07:00
Simon Wilson
e3e4c09d92 resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp 
Conflicts:
	telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
 2011-05-26 12:53:15 -07:00
James Dong
f6fa21cc97 Merge "Extract embedded cover art (aka poster frame) in mp4 files" 2011-05-26 12:00:51 -07:00
James Dong
128e496b91 am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2 
* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
  Revert "Use pread() to get the decrypted data for container based DRM file."
 2011-05-26 11:41:30 -07:00
Jeff Brown
b94d45c30a am a1a56bd0: (-s ours) am 6ef142a0: am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE) 
* commit 'a1a56bd0e3d730edab327495acd5d90b10a6f1e4':
  Fix bug reporting presence of orientation axis. (DO NOT MERGE)
 2011-05-26 11:41:12 -07:00
Jeff Brown
a7ebdcd69a am 23e620b3: (-s ours) am 53c3d5b1: am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE) 
* commit '23e620b32f9c243e124309681b95fe228feb53b8':
  Add tap/drag touchpad gesture. (DO NOT MERGE)
 2011-05-26 11:40:46 -07:00
Jeff Brown
0c8be91d1b am 3c2fb024: (-s ours) am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE) 
* commit '3c2fb0242b0ec21101959dfa08aad3162a523634':
  Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
 2011-05-26 11:40:20 -07:00
Jeff Brown
3dee7f2651 am 13412d31: (-s ours) am e8dc05aa: am a6dbfdd3: Add a sprite controller. (DO NOT MERGE) 
* commit '13412d31650366f41b1f3d9f429cb0a01dd575ef':
  Add a sprite controller. (DO NOT MERGE)
 2011-05-26 11:40:14 -07:00
Jeff Brown
3cad67fba8 am fbc67977: (-s ours) am d5358874: am 5ced76a1: Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE) 
* commit 'fbc67977aecfd94e8923e8eca3b859cd431c94b8':
  Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
 2011-05-26 11:39:57 -07:00
Jeff Brown
dfba89a57f am e79397df: (-s ours) am dd2534c2: am 7157f6fe: Allow batching samples onto the pending motion event. (DO NOT MERGE) 
* commit 'e79397df614d2a489906c44df214a4ea5c49c043':
  Allow batching samples onto the pending motion event. (DO NOT MERGE)
 2011-05-26 11:39:46 -07:00
Jeff Brown
a5e525810c am da97f16c: (-s ours) am c5c7e047: am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE) 
* commit 'da97f16c5d62d96c1b774a73da23bdc3e3e7b794':
  Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
 2011-05-26 11:39:35 -07:00
Jeff Brown
ddb3b41ab2 am b9b9b3e2: (-s ours) am 6f37a7f9: am eea0aa25: Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE) 
* commit 'b9b9b3e271ce33f71797d6795bcccb5d0bcd6292':
  Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
 2011-05-26 11:39:29 -07:00
Dianne Hackborn
2992337f5a Merge "Rework how we decide whether to use system or status bar." into honeycomb-mr2 2011-05-26 11:39:22 -07:00
Jeff Brown
db486ebb3c am 14c45e2e: (-s ours) am 16f1d2ca: am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2 
* commit '14c45e2ef99bf87848a379879dbf8f4090799307':
  Support chorded fallback keys. (DO NOT MERGE)
 2011-05-26 11:39:22 -07:00
Jeff Brown
fbb71d251b am 92693bce: (-s ours) am 32b7bcc8: am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2 
* commit '92693bce936c1cdbfd9e1b81c4eaf1fe9cf5568e':
  Fix focused application handle. (DO NOT MERGE)
 2011-05-26 11:39:10 -07:00
Jeff Brown
9bbfc2c412 am 54bd4cae: (-s ours) am 8ea6e641: am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2 
* commit '54bd4caeabc5daddfce56269949daccd8e7bf661':
  Optimize EventHub to process events in big chunks. (DO NOT MERGE)
 2011-05-26 11:38:58 -07:00
Jeff Brown
fd8a76b9d1 am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2 
* commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e':
  Refactor how timeouts are calculated. (DO NOT MERGE)
 2011-05-26 11:38:48 -07:00
Jeff Brown
eed8d87a0d am 7d0fb570: (-s ours) am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2 
* commit '7d0fb57044576fd4bbaf9683997bab288c3b759c':
  Improve VelocityTracker numerical stability. (DO NOT MERGE)
 2011-05-26 11:38:35 -07:00
Jeff Brown
966b5f9055 am 4e3ba25c: (-s ours) am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2 
* commit '4e3ba25cc718bbc6db0a332c4105debc4b3552d3':
  Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
 2011-05-26 11:38:24 -07:00
Eric Fischer
423eb5e44c Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:36:58 -07:00
Wink Saville
2150dd3750 am f55e0346: Merge "Remove or disable some verbose debugging." into honeycomb-LTE 
* commit 'f55e0346a5a40714be8a7e1571ff65e6ef1a9949':
  Remove or disable some verbose debugging.
 2011-05-26 11:07:18 -07:00
Dianne Hackborn
74ab5dd5c3 am 80ef2a97: am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 
* commit '80ef2a9745e6103efd9698577536bbfed1fd74f6':
  Spiffy new compatibility mode UI.
 2011-05-26 11:02:52 -07:00
Wink Saville
8f59d0771a Merge "Remove or disable some verbose debugging." into honeycomb-LTE 2011-05-26 10:55:46 -07:00
Scott Main
31c9c2f91e Merge "docs: add accepted values for setting status bar visibility" 2011-05-26 10:29:45 -07:00
Dianne Hackborn
86374d16ce am 42f8094c: Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 
* commit '42f8094c066209a65b09d53611ef5c93daba4c51':
  Spiffy new compatibility mode UI.
 2011-05-26 10:00:00 -07:00
Andreas Huber
12673736ec Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams." 2011-05-26 08:52:55 -07:00
Debashish Chatterjee
de335ca8ec Merge "framework/base changes to add new voicemail provider sample." 2011-05-26 07:45:28 -07:00
Daniel Sandler
198b7d0d9e Merge "Framework support for Android Dreams." 2011-05-26 06:01:41 -07:00
Joe Onorato
db53a23dc0 am cfb046de: am 2c09a9c0: am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2 
* commit 'cfb046dead49568de6f6808a697e0508ef39a3a6':
  Make adb shell am display-size persistent.
 2011-05-25 21:29:07 -07:00
Dianne Hackborn
09f8d45589 am 103e74d9: am d6f29cd8: am 2a15eb55: Merge "Fix issue #4445007: DPM initializes some values to 1, instead of 0" into honeycomb-mr2 
* commit '103e74d9b1fdebbbc035da0567cd075554d4137d':
  Fix issue #4445007: DPM initializes some values to 1, instead of 0
 2011-05-25 21:28:39 -07:00
Amith Yamasani
f0654ca13d am 361c286d: (-s ours) am 5d9e0a1a: am 99a8e1d2: Merge "More preference item visual adjustments for smaller tablets. DO NOT MERGE" into honeycomb-mr2 
* commit '361c286d095a22152750e73b01bfc6b1d2076a4d':
  More preference item visual adjustments for smaller tablets. DO NOT MERGE
 2011-05-25 21:28:31 -07:00
Russell Brenner
48567a8ad8 am dd36e1bd: (-s ours) am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2 
* commit 'dd36e1bde1e05cc9ece468693ea286536efad180':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
 2011-05-25 21:27:41 -07:00
Dianne Hackborn
0e7b61f1c3 Merge "Spiffy new compatibility mode UI." into honeycomb-mr2 2011-05-25 21:18:36 -07:00
Mike Lockwood
cba23fa4cd Merge "Environment: Fix default mount point for external storage" 2011-05-25 20:36:05 -07:00
Dianne Hackborn
128682606b Merge "resolved conflicts for merge of 77dd616e to master" 2011-05-25 20:35:04 -07:00
Gloria Wang
4bb4da8653 Merge "For out of band timed text support (timed text in a separate file)." 2011-05-25 20:11:25 -07:00
Jeff Brown
c2dac80166 am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2 
* commit 'a4e747445ac0bdd2cc561802c9c7abfedbd0d981':
  Touch pad UX improvements.
 2011-05-25 19:19:01 -07:00
Jeff Brown
de51c0988e am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2 
* commit 'fa574c0e0ce7f84eea34e96dededea35329dbd18':
  Touch pad UX improvements.
 2011-05-25 19:16:39 -07:00
Jeff Brown
ab184a4855 Merge "Touch pad UX improvements." into honeycomb-mr2 2011-05-25 19:15:24 -07:00
Jeff Brown
17c614e241 am 919a2efe: am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2 
* commit '919a2efeeff6c5ac0dc36883c84d13ed4ca6bce2':
  Fix deadlock in dispatcher. (DO NOT MERGE)
 2011-05-25 19:00:42 -07:00
Jeff Brown
657467eccd am 5665770b: Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2 
* commit '5665770bc4449a96f2365bec71fb012ca2e7bc81':
  Fix deadlock in dispatcher. (DO NOT MERGE)
 2011-05-25 18:58:22 -07:00
Jeff Brown
8808af5c05 Merge "Fix deadlock in dispatcher. (DO NOT MERGE)" into honeycomb-mr2 2011-05-25 18:55:52 -07:00
Adam Powell
48fcbcf299 am b017632d: am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 
* commit 'b017632dad1c6a89cbdc02a9fa7a0029a7dbac12':
  Updated popup dialog 9 patches (light)
 2011-05-25 18:16:48 -07:00
Adam Powell
cf9055682e am 5a328f0f: Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 
* commit '5a328f0f7cf88a2b917db15aec9f9d1714db3e06':
  Updated popup dialog 9 patches (light)
 2011-05-25 18:12:40 -07:00
Adam Powell
d97a0b6d77 Merge "Updated popup dialog 9 patches (light)" into honeycomb-mr2 2011-05-25 18:10:22 -07:00
Romain Guy
0d56207474 Merge "Rename test to be able to launch it on crespo." 2011-05-25 17:49:50 -07:00
Joe Onorato
a20423e141 am 94a06bd8: am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '94a06bd8db0d19be3108bd2ee709373f80318c8b':
  Move status bar icons to sw600.
 2011-05-25 17:42:27 -07:00
Joe Onorato
a343131719 am 6fb093b1: Merge "Move status bar icons to sw600." into honeycomb-mr2 
* commit '6fb093b14bb1bf4b933a5f624b03085977d12ff9':
  Move status bar icons to sw600.
 2011-05-25 17:39:04 -07:00
Joe Onorato
e7346081dd Merge "Move status bar icons to sw600." into honeycomb-mr2 2011-05-25 17:36:54 -07:00
Dianne Hackborn
717d0dee49 resolved conflicts for merge of 77dd616e to master 
Change-Id: Idb7180177b01e7d822327ccc7c76617220860da2
 2011-05-25 16:36:50 -07:00