ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,239 Commits 2 Branches 0 Tags 54 MiB
e61da1bc89
Commit Graph

15239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
b3c91bd487 Merge "GpsLocationProvider: optimize wake lock usage." into kraken 2010-04-14 16:35:29 -07:00
Patrick Scott
9b6756907b Merge branch 'kraken' of ssh://android-git:29418/platform/frameworks/base into kraken 2010-04-14 16:33:44 -07:00
Vasu Nori
c9d9404b5e am bad5f620: am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo 
Merge commit 'bad5f620df13ae41374e05cad0a391ab084664c4' into kraken

* commit 'bad5f620df13ae41374e05cad0a391ab084664c4':
  verify database state before calling sqlite. Bug:2593970
 2010-04-14 16:33:32 -07:00
Grace Kloba
0df972e642 am e35a45b7: am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo 
Merge commit 'e35a45b761ee38c04181bff0a72a6501101bf181' into kraken

* commit 'e35a45b761ee38c04181bff0a72a6501101bf181':
  Pass WebKit scrollbar mode to Java. When scrollbar
 2010-04-14 16:33:27 -07:00
Vasu Nori
773dbcc0a0 am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo 
Merge commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp

* commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63':
  verify database state before calling sqlite. Bug:2593970
 2010-04-14 16:27:04 -07:00
Grace Kloba
58ab590bc5 am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo 
Merge commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7' into froyo-plus-aosp

* commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7':
  Pass WebKit scrollbar mode to Java. When scrollbar
 2010-04-14 16:26:55 -07:00
Vasu Nori
661bc51cbb Merge "verify database state before calling sqlite. Bug:2593970" into froyo 2010-04-14 15:53:43 -07:00
Romain Guy
bc355144ed Merge "Ensure Gallery does not unselect the selected item after a layout. Bug #2573921" 2010-04-14 14:45:43 -07:00
Grace Kloba
218aa6b818 Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo 2010-04-14 12:44:05 -07:00
Eric Laurent
01974f88fa am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode. 
Merge commit 'def7db5b79e5c178834375020ef6b590e80af42f' into kraken

* commit 'def7db5b79e5c178834375020ef6b590e80af42f':
  Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
 2010-04-14 12:15:18 -07:00
Daniel Sandler
c70ceda5ab Merge "Missing resources for lock screen." into kraken 2010-04-14 12:15:04 -07:00
Eric Laurent
7c5ee747da am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 
Merge commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken

* commit '834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
 2010-04-14 12:11:24 -07:00
Andrei Popescu
6f4b396488 am 6083f5eb: am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 
Merge commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3' into kraken

* commit '6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3':
  Make sure the onended event is dispatched even when
 2010-04-14 12:11:21 -07:00
Dianne Hackborn
4e52bafe10 am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 
Merge commit '11d7502b35374da12168004e277bcc87f4f7bb50' into kraken

* commit '11d7502b35374da12168004e277bcc87f4f7bb50':
  Fix issue #593153: Broadcast time out when sending...
 2010-04-14 12:11:17 -07:00
James Dong
7cb5382837 am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 
Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken

* commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677':
  Use PV_PLAYER to handle RTSP streaming
 2010-04-14 12:11:12 -07:00
Robert Greenwalt
508526a5ef am 57e60854: am 22b3644a: Update the datause icons. 
Merge commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b' into kraken

* commit '57e60854f3c7a64aad3c4178df210c6f3e98ee8b':
  Update the datause icons.
 2010-04-14 12:11:07 -07:00
Robert Greenwalt
04a77cc358 am b26c8dd4: am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo 
Merge commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4' into kraken

* commit 'b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4':
  Perist Throttle data across reboots
 2010-04-14 12:11:03 -07:00
Leon Scroggins
d3e0d4217e am 876a5dfe: am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 
Merge commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976' into kraken

* commit '876a5dfe3b4a7e0b7bba6b6227a2db2038f29976':
  Ensure the selection does not change in setTextAndKeepSelection.
 2010-04-14 12:10:58 -07:00
Kristian Monsen
ecfe432849 am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo 
Merge commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7' into kraken

* commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7':
  Fix for 2585858, load invalid urls.
 2010-04-14 12:10:53 -07:00
Kristian Monsen
8d44aec3da am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 
Merge commit '3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken

* commit '3e360000fcb1cc60d8786d1340f9a468014c6435':
  Fix (again) for bug 2558156, update cache encoding correctly
 2010-04-14 12:10:47 -07:00
Eric Laurent
4024e20f13 am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode. 
Merge commit '758dd527f64f1e827adfe09f0141ab213733ca22' into froyo-plus-aosp

* commit '758dd527f64f1e827adfe09f0141ab213733ca22':
  Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
 2010-04-14 12:09:52 -07:00
Eric Laurent
0536e3255c am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 
Merge commit '745b43c28fd6bb82c72a15b28be75c55dd115171' into froyo-plus-aosp

* commit '745b43c28fd6bb82c72a15b28be75c55dd115171':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
 2010-04-14 12:04:16 -07:00
Andrei Popescu
8dd91d14ac am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 
Merge commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412' into froyo-plus-aosp

* commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412':
  Make sure the onended event is dispatched even when
 2010-04-14 12:04:13 -07:00
Dianne Hackborn
21989a73b7 am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 
Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp

* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
  Fix issue #593153: Broadcast time out when sending...
 2010-04-14 12:04:07 -07:00
James Dong
d198c9d51a am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 
Merge commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50' into froyo-plus-aosp

* commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50':
  Use PV_PLAYER to handle RTSP streaming
 2010-04-14 12:03:53 -07:00
Robert Greenwalt
dfea74ea10 am 22b3644a: Update the datause icons. 
Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp

* commit '22b3644ac2027d055a6b187c979ef492ee6fb082':
  Update the datause icons.
 2010-04-14 12:03:33 -07:00
Robert Greenwalt
d241170ec8 am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo 
Merge commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp

* commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
  Perist Throttle data across reboots
 2010-04-14 12:03:22 -07:00
Leon Scroggins
0b450acc58 am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 
Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp

* commit 'b2212464a3bc4103a9e5e88602d1097c835d7949':
  Ensure the selection does not change in setTextAndKeepSelection.
 2010-04-14 12:02:53 -07:00
Kristian Monsen
199bc05e4f am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo 
Merge commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e' into froyo-plus-aosp

* commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e':
  Fix for 2585858, load invalid urls.
 2010-04-14 12:02:10 -07:00
Kristian Monsen
bb80da1075 am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 
Merge commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f' into froyo-plus-aosp

* commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f':
  Fix (again) for bug 2558156, update cache encoding correctly
 2010-04-14 12:02:01 -07:00
Dianne Hackborn
4caa775ab9 Merge "2593810 Accessibility event's parcelableData property not nullified during recycling" 2010-04-14 12:00:32 -07:00
Dianne Hackborn
3cbaf63564 Merge " 2593833 AccessibilityManager not properly initialized immediately upon registration in the AccessibilityManagerService" 2010-04-14 12:00:17 -07:00
Eric Laurent
8155b783fa Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo 2010-04-14 10:39:32 -07:00
Jean-Baptiste Queru
46e935bf01 manual merge 
Change-Id: I0a81f92831dabc518cfd33b40ea93fd496a1a01c
 2010-04-14 10:29:49 -07:00
Andrei Popescu
41ac20f22f Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo 2010-04-14 10:26:58 -07:00
Dianne Hackborn
b1016fe1f2 Merge "Fix issue #593153: Broadcast time out when sending..." into froyo 2010-04-14 10:16:35 -07:00
James Dong
685bc905d9 Merge "Use PV_PLAYER to handle RTSP streaming" into froyo 2010-04-14 09:59:33 -07:00
Robert Greenwalt
281cec9ffb Merge "Perist Throttle data across reboots" into froyo 2010-04-14 09:07:25 -07:00
Leon Scroggins
c566beb7bb Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo 2010-04-14 06:42:20 -07:00
Kristian Monsen
e56943a535 Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-14 02:22:18 -07:00
Kristian Monsen
43229f29c9 Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-14 02:22:05 -07:00
Daniel Sandler
aef7790531 Merge "Manually integrating froyo lockscreen fixes:" into kraken 2010-04-13 20:34:23 -07:00
Carl Shapiro
aa034b9445 Merge "Add command line flags to enable lock profiling." 2010-04-13 18:27:55 -07:00
Dianne Hackborn
534f5b415c am 7b16f95c: am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo 
Merge commit '7b16f95cd293cedd2b9204428088ea3e2f8399e5' into kraken

* commit '7b16f95cd293cedd2b9204428088ea3e2f8399e5':
  Fix issue #2555171: Switching to app immediately after unmounting...
 2010-04-13 18:21:45 -07:00
Dianne Hackborn
8950fece79 am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo 
Merge commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293' into froyo-plus-aosp

* commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293':
  Fix issue #2555171: Switching to app immediately after unmounting...
 2010-04-13 18:10:35 -07:00
Dianne Hackborn
01cc0c1291 am cd616247: am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes 
Merge commit 'cd616247db69bdae8ab781be1f1d646ac7abf755' into kraken

* commit 'cd616247db69bdae8ab781be1f1d646ac7abf755':
  Framework change for #2583442: Navigation dies when night mode changes
 2010-04-13 18:08:17 -07:00
Dianne Hackborn
c308249487 Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo 2010-04-13 18:07:27 -07:00
Dianne Hackborn
fa88e250f4 am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes 
Merge commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e' into froyo-plus-aosp

* commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e':
  Framework change for #2583442: Navigation dies when night mode changes
 2010-04-13 18:05:47 -07:00
Dianne Hackborn
77701be29f am fbd22f07: am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo 
Merge commit 'fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken

* commit 'fbd22f072b48be4b465085fb5354890e2f10fd32':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
 2010-04-13 18:02:11 -07:00
Dianne Hackborn
8c16dfac1a am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo 
Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp

* commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
 2010-04-13 17:59:56 -07:00