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

22371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristian Monsen
c8c5363df3 am d2688cb1: am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-15 06:37:33 -07:00
Kristian Monsen
42ae4885ed am 11d60e0b: am 3e360000: am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-15 06:37:21 -07:00
Jean-Baptiste Queru
c716307594 am 31a17033: fix unintentional drift 2010-04-15 06:36:35 -07:00
Jean-Baptiste Queru
561f735eac am 0b23c143: (-s ours) manual merge 2010-04-15 06:35:59 -07:00
Romain Guy
1b2d7ec487 Merge "Ensure Gallery does not unselect the selected item after a layout. Bug #2573921" 2010-04-14 14:45:43 -07:00
Romain Guy
6691fcfbc8 Ensure Gallery does not unselect the selected item after a layout. 
Bug #2573921

Change-Id: I5c39881f541835fe5515b35a9f12761a8a2c1b8b
 2010-04-14 14:43:18 -07:00
Kristian Monsen
d2688cb1de 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
11d60e0b33 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
Kristian Monsen
a18df1341e 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
3e360000fc 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
7946d07183 Merge "2593810 Accessibility event's parcelableData property not nullified during recycling" 2010-04-14 12:00:32 -07:00
Dianne Hackborn
a3edb681ef Merge " 2593833 AccessibilityManager not properly initialized immediately upon registration in the AccessibilityManagerService" 2010-04-14 12:00:17 -07:00
Mike Reed
d404d6f162 update dox for FILL_AND_STROKE style 
Change-Id: I7835068a376dfa4d8c18d8bb20d97941a058e89f
http://b/issue?id=2590047
 2010-04-14 14:46:46 -04:00
Jean-Baptiste Queru
31a17033dc fix unintentional drift 
Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
 2010-04-14 10:40:28 -07:00
Jean-Baptiste Queru
0b23c1436a manual merge 
Change-Id: I0a81f92831dabc518cfd33b40ea93fd496a1a01c
 2010-04-14 10:29:49 -07:00
Tom O'Neill
c096a9aead Minor fixes in hello-tabwidget.jd 
Fix some typos, including a few that lead to non-functioning code.

Change-Id: I99e6f290189ec7451a7ceffb14f5ac2a1159673f
 2010-04-14 09:36:37 -07:00
Kristian Monsen
d503a1524a Merge "Fix for 2585858, load invalid urls." into froyo 2010-04-14 02:22:18 -07:00
Kristian Monsen
53c0c0daf4 Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo 2010-04-14 02:22:05 -07:00
Daniel Sandler
099fc362e2 Merge "Manually integrating froyo lockscreen fixes:" into kraken 2010-04-13 20:34:23 -07:00
Svetoslav Ganov
9efd078c6b 2593810 Accessibility event's parcelableData property not nullified during recycling 
Change-Id: I88d6f3d63d7ff0fbdd88fb9cb642349029838b31
 2010-04-13 18:47:28 -07:00
Svetoslav Ganov
dd64a9b0d6 2593833 AccessibilityManager not properly initialized immediately upon registration in the AccessibilityManagerService 
Change-Id: I0226bafc5e9c5b800c54019c9309394f1e5f9e88
 2010-04-13 18:41:17 -07:00
Carl Shapiro
a3e259e808 Merge "Add command line flags to enable lock profiling." 2010-04-13 18:27:55 -07:00
Dianne Hackborn
baa0fd95cf 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
7b16f95cd2 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
6d11272285 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
8e1f2f8804 Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo 2010-04-13 18:07:27 -07:00
Dianne Hackborn
cd616247db 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
b7d9e8e17b 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
ce73c1e5bf Framework change for #2583442: Navigation dies when night mode changes 
The window manager doesn't retain its keep screen on lock while
in the process of destroying and creating new activity windows during
a config change.  Now it does.

Unfortunately, this doesn't help maps, since it doesn't use our
lovely KEEP_SCREEN_ON flag. :p

Change-Id: Ida4bc0fcfe132cdff2bd4eeb7ba0ce9731504d14
 2010-04-13 18:01:40 -07:00
Dianne Hackborn
fbd22f072b 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
Dianne Hackborn
ae8c2c71f7 Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo 2010-04-13 17:57:23 -07:00
Dianne Hackborn
53d9264de4 Fix issue #2555171: Switching to app immediately after unmounting... 
...SD card causes reboot.

Add option to not include temporarily unavailable recent tasks,
for the recent tasks UI to not display them.

Change-Id: I1495ca217b4292fd56f537459b44c0624262c292
 2010-04-13 17:35:22 -07:00
Grace Kloba
b5c9873e7c am 53a37509: am ba6339fe: Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can\'t depend on contentToView() to convert the doc point to the view point. When we originall 
Merge commit '53a37509c3a9301423ee6ec47c71bcea47e46d9c' into kraken

* commit '53a37509c3a9301423ee6ec47c71bcea47e46d9c':
  If we defer processing the touch events, pass the
 2010-04-13 17:28:17 -07:00
Grace Kloba
53a37509c3 am ba6339fe: Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can\'t depend on contentToView() to convert the doc point to the view point. When we originally convert the 
Merge commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2' into froyo-plus-aosp

* commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2':
  If we defer processing the touch events, pass the
 2010-04-13 17:24:04 -07:00
Grace Kloba
ba6339fe2b Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can't depend on contentToView() to convert the doc point to the view point. When we originally convert the view to doc, the scroll position in UI doesn't change. When we convert the doc back to view, we are chasing a moving target. That is why we saw bigger delta." into froyo 2010-04-13 17:20:29 -07:00
Robert Greenwalt
6ff9d5130c am 13ec98f3: am 84748629: am a466ffe0: am d3bb93f6: Add build config values for data use defaults 2010-04-13 16:29:12 -07:00
James Dong
10628bb57a am 748a8df0: am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo 2010-04-13 16:29:08 -07:00
Suchi Amalapurapu
6d46982a20 am 3cf6bba0: am 2ae08f70: am a55987df: am 812b24fd: Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call 2010-04-13 16:29:04 -07:00
Robert Greenwalt
dc066b4af5 am ae5ec702: am 7024396f: am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo 2010-04-13 16:28:58 -07:00
Christopher Tate
cdb45b0edb am c2b8b5f8: am 0162c3c7: am 3643dc8c: am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo 2010-04-13 16:28:51 -07:00
Grace Kloba
102ed89dbc If we defer processing the touch events, pass the 
original view coordinate with TouchEventData and use
them when we reprocess the events. We can't depend
on contentToView() to convert the doc point to the
view point. When we originally convert the view to
doc, the scroll position in UI doesn't change. When
we convert the doc back to view, we are chasing a
moving target. That is why we saw bigger delta.

Fix  http://b/issue?id=2577274
 2010-04-13 16:27:41 -07:00
Andreas Huber
76531828c7 am 5ab60ba0: am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o 2010-04-13 16:24:54 -07:00
James Dong
c488e161b5 am eee53a7d: am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo 2010-04-13 16:24:49 -07:00
Grace Kloba
d40746b13d am 105c58de: am 346c97c4: am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640 2010-04-13 16:24:42 -07:00
Amith Yamasani
6906da34a7 am ecf917b6: am 61f280d5: am feb976e6: am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo 2010-04-13 16:24:36 -07:00
Jean-Michel Trivi
7558905bdf am 824ca797: am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo 2010-04-13 16:24:29 -07:00
Gloria Wang
e2693174a4 am ce387505: am 465934d1: am d4c072d3: am b19da8e1: Fix for 2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available. 2010-04-13 16:24:23 -07:00
Daniel Sandler
57e6f58bb7 am cd3f349f: am a32efedd: am de3601e0: am bcac4960: Honor the "Never vibrate" setting for incoming calls. 2010-04-13 16:24:16 -07:00
Robert Greenwalt
13ec98f313 am 84748629: am a466ffe0: am d3bb93f6: Add build config values for data use defaults 2010-04-13 16:23:09 -07:00
James Dong
748a8df0cd am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo 2010-04-13 16:23:05 -07:00