ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
13,840 Commits 2 Branches 0 Tags 54 MiB
f96f63d9ce
Commit Graph

13840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
75713ec76b Merge "Fix for Never not existing in latest timeout values." into froyo 2010-03-30 15:19:00 -07:00
Grace Kloba
0604c62a01 am 19c1ea3b: am eb643f26: Merge "Remove the shadow under url bar." into froyo 
Merge commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7' into kraken

* commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7':
  Remove the shadow under url bar.
 2010-03-30 14:59:19 -07:00
Grace Kloba
cbf14323dd am eb643f26: Merge "Remove the shadow under url bar." into froyo 
Merge commit 'eb643f2685bd404ef5abb622123cea0aa17939d7' into froyo-plus-aosp

* commit 'eb643f2685bd404ef5abb622123cea0aa17939d7':
  Remove the shadow under url bar.
 2010-03-30 14:56:14 -07:00
Grace Kloba
3c21699f33 Merge "Remove the shadow under url bar." into froyo 2010-03-30 14:51:48 -07:00
David Turner
ecf9b68112 Merge "gl_code : add end of line." 2010-03-30 14:50:44 -07:00
Irfan Sheriff
e5c4da1b0c am 295eb97c: am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo 
Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken

* commit '295eb97c7623105d6199fa91e58394e474a0abb1':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
 2010-03-30 13:55:21 -07:00
Irfan Sheriff
41093e83eb am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo 
Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp

* commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
 2010-03-30 13:51:46 -07:00
Dianne Hackborn
2d5d669e50 am ab86fc91: am de2722af: Merge "Package manager optimizations." into froyo 
Merge commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a' into kraken

* commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a':
  Package manager optimizations.
 2010-03-30 13:42:50 -07:00
Dianne Hackborn
db0ee987d5 am de2722af: Merge "Package manager optimizations." into froyo 
Merge commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8' into froyo-plus-aosp

* commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8':
  Package manager optimizations.
 2010-03-30 13:40:24 -07:00
Andreas Huber
98b06bda70 am 0bca99e9: am 8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should\'ve been more data available." into froyo 
Merge commit '0bca99e987420a63ebd509093cbde015399d8522' into kraken

* commit '0bca99e987420a63ebd509093cbde015399d8522':
  Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
 2010-03-30 13:40:11 -07:00
Dianne Hackborn
b89603e391 Merge "Package manager optimizations." into froyo 2010-03-30 13:35:33 -07:00
Andreas Huber
27c8839273 am 8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should\'ve been more data available." into froyo 
Merge commit '8899186b60bcbfa783217a0f773e4cd032911f3c' into froyo-plus-aosp

* commit '8899186b60bcbfa783217a0f773e4cd032911f3c':
  Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
 2010-03-30 13:34:39 -07:00
Andreas Huber
f734b65e83 Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available." into froyo 2010-03-30 13:31:57 -07:00
Christopher Tate
ee3e8dcc71 am b3f7fe44: am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 
Merge commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c' into kraken

* commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
 2010-03-30 13:17:23 -07:00
Christopher Tate
fb2dbb6c9a am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 
Merge commit '22375e4a736c0d646c3cf0905c15126f7f4107c2' into froyo-plus-aosp

* commit '22375e4a736c0d646c3cf0905c15126f7f4107c2':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
 2010-03-30 13:13:52 -07:00
Christopher Tate
8cb8614fdc Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 2010-03-30 13:09:50 -07:00
Daniel Sandler
8853a82607 am 454a956b: am a7035909: Remove logspew. 
Merge commit '454a956b52884083e3436fe2ea7e478df2bcbeea' into kraken

* commit '454a956b52884083e3436fe2ea7e478df2bcbeea':
  Remove logspew.
 2010-03-30 12:56:36 -07:00
Daniel Sandler
2b1545b216 am a7035909: Remove logspew. 
Merge commit 'a7035909453c9980a5f8547f5090c70c4281156c' into froyo-plus-aosp

* commit 'a7035909453c9980a5f8547f5090c70c4281156c':
  Remove logspew.
 2010-03-30 12:53:28 -07:00
Patrick Scott
a3762b480d am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo 
Merge commit '7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken

* commit '7fb1a89128a87c30441bc839c935f8e1fb993a26':
  Fix a simple logic mistake.
 2010-03-30 11:49:12 -07:00
Patrick Scott
2943c181a4 am ae405d56: Merge "Fix a simple logic mistake." into froyo 
Merge commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp

* commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf':
  Fix a simple logic mistake.
 2010-03-30 11:45:55 -07:00
Patrick Scott
85cf79e0df Merge "Fix a simple logic mistake." into froyo 2010-03-30 11:41:29 -07:00
Jean-Michel Trivi
a9765095bc am 38cb6197: am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer 
Merge commit '38cb619770cf7b4207f464edc4839c79c03ad372' into kraken

* commit '38cb619770cf7b4207f464edc4839c79c03ad372':
  Fix bug 2553592 API REVIEW: android.speech
 2010-03-30 11:23:23 -07:00
Jean-Michel Trivi
ad136f611c am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer 
Merge commit '2a5d9f9b577376768372837723f0f42098aba13b' into froyo-plus-aosp

* commit '2a5d9f9b577376768372837723f0f42098aba13b':
  Fix bug 2553592 API REVIEW: android.speech
 2010-03-30 11:20:32 -07:00
The Android Open Source Project
f282e93b43 merge from open-source master 
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
 2010-03-30 11:13:47 -07:00
Romain Guy
dced134a0b Merge "Fix last character of password field being visible after rotation" 2010-03-30 10:54:40 -07:00
San Mehat
6a0dedd7b2 am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 
Merge commit 'b07d69920199817904ccb9056e3dd56cf736e438' into kraken

* commit 'b07d69920199817904ccb9056e3dd56cf736e438':
  framework: Hide StorageManager for froyo - DO NOT MERGE
 2010-03-30 10:46:23 -07:00
San Mehat
07cdc8a5d8 am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 
Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp

* commit 'd4610977d9217cbd70dd59f61914c74d1ca61036':
  framework: Hide StorageManager for froyo - DO NOT MERGE
 2010-03-30 10:39:36 -07:00
Jaikumar Ganesh
ca0b6cf8b5 am 77239140: am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device. 
Merge commit '772391402f26f418eee70039e89c0b6a8a9d69eb' into kraken

* commit '772391402f26f418eee70039e89c0b6a8a9d69eb':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
 2010-03-30 10:36:54 -07:00
San Mehat
e3b8bab8f7 Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 2010-03-30 10:35:44 -07:00
Jaikumar Ganesh
560bc8af03 am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device. 
Merge commit '0e09030977aea8b40fd177139528d4b5637c9771' into froyo-plus-aosp

* commit '0e09030977aea8b40fd177139528d4b5637c9771':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
 2010-03-30 10:30:48 -07:00
Kenny Root
6c78c69bf8 am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo 
Merge commit '664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken

* commit '664c7adb1847dd304f36239dc63b4986bf828dc1':
  Import revised translations
 2010-03-30 09:38:14 -07:00
Kenny Root
1efb57f8cc am 7a17f0c0: Merge "Import revised translations" into froyo 
Merge commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f' into froyo-plus-aosp

* commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f':
  Import revised translations
 2010-03-30 09:27:15 -07:00
Kenny Root
857f556c02 Merge "Import revised translations" into froyo 2010-03-30 09:23:16 -07:00
Bjorn Bringert
72e0af4430 am 3f434566: am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting 
Merge commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2' into kraken

* commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2':
  Clean up SearchableInfo API, JavaDoc and formatting
 2010-03-30 04:06:03 -07:00
Bjorn Bringert
0c75c21dc6 am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting 
Merge commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp

* commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
  Clean up SearchableInfo API, JavaDoc and formatting
 2010-03-30 03:59:36 -07:00
Dianne Hackborn
dcc6fc4d61 am e5132805: am e2522466: Fix issue #2547337: switching night modes 
Merge commit 'e5132805110ba98e301b792cc0c2141b1729b680' into kraken

* commit 'e5132805110ba98e301b792cc0c2141b1729b680':
  Fix issue #2547337: switching night modes
 2010-03-29 21:23:08 -07:00
Dianne Hackborn
87d04bf34f am 2fecae38: am ad5499dd: Hopefully get rid of some ANRs. 
Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken

* commit '2fecae386d952197d63fb75f8ec245d87159a684':
  Hopefully get rid of some ANRs.
 2010-03-29 21:23:03 -07:00
Dianne Hackborn
041c512c14 am e2522466: Fix issue #2547337: switching night modes 
Merge commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp

* commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8':
  Fix issue #2547337: switching night modes
 2010-03-29 21:19:39 -07:00
Dianne Hackborn
46f86aa4d5 am ad5499dd: Hopefully get rid of some ANRs. 
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp

* commit 'ad5499dd204a1512471778462a805a288595f2f2':
  Hopefully get rid of some ANRs.
 2010-03-29 21:19:36 -07:00
Adam Powell
81dc6c1514 am 370fe2a9: am 9d32d24d: Remove overscrolling 
Merge commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06' into kraken

* commit '370fe2a91e9e824c6339fc836377c4aa6d80fc06':
  Remove overscrolling
 2010-03-29 21:09:28 -07:00
Adam Powell
33e232955d am 9d32d24d: Remove overscrolling 
Merge commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp

* commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
  Remove overscrolling
 2010-03-29 21:02:47 -07:00
Oscar Montemayor
ec41806007 am 1ec71365: (-s ours) am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 
Merge commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb' into kraken

* commit '1ec71365f98baa24f8df82d9c4a79dd6edc940eb':
  DO NOT MERGE
 2010-03-29 19:03:28 -07:00
Oscar Montemayor
fe6015b4f6 am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 
Merge commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp

* commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740':
  DO NOT MERGE
 2010-03-29 19:01:16 -07:00
Oscar Montemayor
0e23025c0d Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 2010-03-29 18:56:57 -07:00
Charles Chen
5b0d92c50c am 629d03f1: am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 
Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken

* commit '629d03f12251220daf26abc5be86d4649318a331':
  Fix for bug 2548048 - it was impossible for applications to discover
 2010-03-29 18:44:59 -07:00
Charles Chen
88cef743df am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp

* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
  Fix for bug 2548048 - it was impossible for applications to discover
 2010-03-29 18:41:48 -07:00
Charles Chen
a9bdac378b Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 2010-03-29 18:37:41 -07:00
Amith Yamasani
2a6304d7c1 am e7eb3a35: am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 
Merge commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken

* commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
  Fix preloaded classes for API rename of BackupAgentHelper
 2010-03-29 18:33:55 -07:00
Amith Yamasani
2bfddb7f6f am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp

* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
  Fix preloaded classes for API rename of BackupAgentHelper
 2010-03-29 18:28:14 -07:00
Amith Yamasani
c5363eb4ef Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 2010-03-29 18:24:59 -07:00