Commit Graph

6620 Commits

Author SHA1 Message Date
Jeff Sharkey
18df71b822 am 7b6771a9: Bring back per-Account Contact-specific settings.
Merge commit '7b6771a97b9abe821e1cc6c126990fe960278f3a'

* commit '7b6771a97b9abe821e1cc6c126990fe960278f3a':
  Bring back per-Account Contact-specific settings.
2009-08-18 18:26:26 -07:00
Jeff Sharkey
7b6771a97b Bring back per-Account Contact-specific settings.
These are used for two purposes: a flag indicating the
default sync state for Groups to inherit, and a flag that
marks when Contacts that don't belong to any specific group
should be visible in UI.
2009-08-18 18:14:11 -07:00
Romain Guy
85ed67674d am 66575d45: Merge change 21837 into eclair
Merge commit '66575d45d1e52bccf66d278dec29ceb5c288b203'

* commit '66575d45d1e52bccf66d278dec29ceb5c288b203':
  Fix possible NPE on touch mode change in TabHost.
2009-08-18 17:45:13 -07:00
Android (Google) Code Review
66575d45d1 Merge change 21837 into eclair
* changes:
  Fix possible NPE on touch mode change in TabHost.
2009-08-18 17:41:22 -07:00
Romain Guy
7237c56fae Fix possible NPE on touch mode change in TabHost. 2009-08-18 17:38:14 -07:00
Suchi Amalapurapu
3564eb8753 am 41f31b62: am d50066f8: invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService
Merge commit '41f31b62e5f4a6c9bb3021ffa08a3677afe98d38'

* commit '41f31b62e5f4a6c9bb3021ffa08a3677afe98d38':
  invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService
2009-08-18 17:35:49 -07:00
Suchi Amalapurapu
41f31b62e5 am d50066f8: invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService
Merge commit 'd50066f8d2ab82c2c8ff305c86cc9b39eaca3c28' into eclair

* commit 'd50066f8d2ab82c2c8ff305c86cc9b39eaca3c28':
  invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService
2009-08-18 17:31:54 -07:00
Romain Guy
b35a77ca0f am 6c8dd984: Merge change 21831 into eclair
Merge commit '6c8dd9841f9958ae64cd2b8540bb5de70247487c'

* commit '6c8dd9841f9958ae64cd2b8540bb5de70247487c':
  Add reflections to the water
2009-08-18 17:26:06 -07:00
Android (Google) Code Review
6c8dd9841f Merge change 21831 into eclair
* changes:
  Add reflections to the water
2009-08-18 17:22:02 -07:00
Romain Guy
15b2969818 Add reflections to the water 2009-08-18 17:21:07 -07:00
Jason Sams
517969c9a4 am d06aa4fd: Merge change 21825 into eclair
Merge commit 'd06aa4fdc500c9856b4b2994896a2787f06498ee'

* commit 'd06aa4fdc500c9856b4b2994896a2787f06498ee':
  Implement OOB destroy method that can be called from the java finalizer removing the need to explicitly destroy objects.
2009-08-18 17:20:32 -07:00
Suchi Amalapurapu
78bef71ac7 am 9abcba3c: Merge change 21764 into eclair
Merge commit '9abcba3c81e7cce3e52286dd2009dd46cdcae4c4'

* commit '9abcba3c81e7cce3e52286dd2009dd46cdcae4c4':
  Add aapt extensions to dump badging to print more info about activities, receivers and services
2009-08-18 17:20:23 -07:00
Dianne Hackborn
9f459c7626 am 12c9561b: Merge change 21811 into eclair
Merge commit '12c9561b8faf630517896b0b8caf39e35d8566fd'

* commit '12c9561b8faf630517896b0b8caf39e35d8566fd':
  More wallpaper fixes: scroll position, visibility, leaking.
2009-08-18 17:20:20 -07:00
Jason Sams
d16818a71c am 062292b9: Merge change 21776 into eclair
Merge commit '062292b9804827258388ad972fa1159e6f92c46f'

* commit '062292b9804827258388ad972fa1159e6f92c46f':
  Cleanup of object destruction.  No need to have a per-class destruction function.  This was a legacy of the distant past when the classes did not have a common base.
2009-08-18 17:20:04 -07:00
Wink Saville
40f111bfdd am 6c317acc: Merge change 21790 into eclair
Merge commit '6c317acc9f1d43cd5d75e3b766c5431cf2a354d8'

* commit '6c317acc9f1d43cd5d75e3b766c5431cf2a354d8':
  Dormant ICON was not being displayed, fixes bug 2039239.
2009-08-18 17:19:58 -07:00
Android (Google) Code Review
d06aa4fdc5 Merge change 21825 into eclair
* changes:
  Implement OOB destroy method that can be called from the java finalizer removing the need to explicitly destroy objects.
2009-08-18 17:15:04 -07:00
Jason Sams
730ee65d4d Implement OOB destroy method that can be called from the java finalizer removing the need to explicitly destroy objects. 2009-08-18 17:07:09 -07:00
Suchi Amalapurapu
d50066f8d2 invoke sendMessage instead of dispatchMessage to avoid deadlocks in ActivityManagerService 2009-08-18 17:03:10 -07:00
Android (Google) Code Review
9abcba3c81 Merge change 21764 into eclair
* changes:
  Add aapt extensions to dump badging to print more info about activities, receivers and services Fix issue with checking end tags. Earlier some boolean variables were being set once a new tag is detected at the same level which causes some incorrect values to be overwritten. we should be doing this when we detect the end tag.
2009-08-18 16:57:02 -07:00
Android (Google) Code Review
12c9561b8f Merge change 21811 into eclair
* changes:
  More wallpaper fixes: scroll position, visibility, leaking.
2009-08-18 16:54:59 -07:00
Suchi Amalapurapu
1b125980c5 Add aapt extensions to dump badging to print more info about activities, receivers and services
Fix issue with checking end tags. Earlier some boolean variables were being set once a new
tag is detected at the same level which causes some incorrect values to be overwritten.
we should be doing this when we detect the end tag.
2009-08-18 16:25:28 -07:00
Dianne Hackborn
e9e9bca842 More wallpaper fixes: scroll position, visibility, leaking.
This fixes a bunch of edge cases in updating the wallpaper's scroll position
and visibility when switching between wallpapers and traveling through the UI.

It also fixes some leaks of wallpaper tokens and windows.
2009-08-18 15:59:34 -07:00
Android (Google) Code Review
062292b980 Merge change 21776 into eclair
* changes:
  Cleanup of object destruction.  No need to have a per-class destruction function.  This was a legacy of the distant past when the classes did not have a common base.
2009-08-18 15:51:36 -07:00
Android (Google) Code Review
6c317acc9f Merge change 21790 into eclair
* changes:
  Dormant ICON was not being displayed, fixes bug 2039239.
2009-08-18 15:41:14 -07:00
Dianne Hackborn
d69b0c9fb3 am 1066cbca: Fix build.
Merge commit '1066cbcac08268e2254ed6818181949d83e9ba1c'

* commit '1066cbcac08268e2254ed6818181949d83e9ba1c':
  Fix build.
2009-08-18 15:14:38 -07:00
Dianne Hackborn
1066cbcac0 Fix build. 2009-08-18 15:09:23 -07:00
Jason Sams
7ce033d797 Cleanup of object destruction. No need to have a per-class destruction function. This was a legacy of the distant past when the classes did not have a common base. 2009-08-18 14:20:07 -07:00
Dianne Hackborn
d2cbc66fb4 am 48134b78: Merge change 21770 into eclair
Merge commit '48134b78d53eca2a0a71799b0901aba5997f2eba'

* commit '48134b78d53eca2a0a71799b0901aba5997f2eba':
  Fix issue #2047139: Remove Service.setForeground()
2009-08-18 14:19:43 -07:00
Android (Google) Code Review
48134b78d5 Merge change 21770 into eclair
* changes:
  Fix issue #2047139: Remove Service.setForeground()
2009-08-18 14:15:38 -07:00
Dianne Hackborn
d8a43f6168 Fix issue #2047139: Remove Service.setForeground()
This API is becoming seriously abused, so now it is deprecated and has
become a no-op.

As an alternative, there is now a new API that allows you to make a service
be in the foreground but requires providing a persistent notification to
go along with this state, allowing the user to know about and control it.
2009-08-18 13:59:27 -07:00
Xavier Ducrohet
6494f4c1f8 am f369b719: am ad4bc607: Merge change 21772 into donut
Merge commit 'f369b7199f537bba7d8fced8b0f826249d19fdf5'

* commit 'f369b7199f537bba7d8fced8b0f826249d19fdf5':
  Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
2009-08-18 13:46:58 -07:00
Xavier Ducrohet
f369b7199f am ad4bc607: Merge change 21772 into donut
Merge commit 'ad4bc607bd236dd9b06df9cf89dc5e14541ff66c' into eclair

* commit 'ad4bc607bd236dd9b06df9cf89dc5e14541ff66c':
  Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
2009-08-18 13:42:09 -07:00
Wink Saville
d324c81c04 Dormant ICON was not being displayed, fixes bug 2039239. 2009-08-18 13:41:07 -07:00
Android (Google) Code Review
ad4bc607bd Merge change 21772 into donut
* changes:
  Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
2009-08-18 13:39:50 -07:00
Xavier Ducrohet
72e4bcd3d0 Fix Resources#opeRawResource(int, TypedValue) in layoutlib. 2009-08-18 13:35:55 -07:00
Eric Fischer
83a99a836a am d97bcef6: (-s ours) am 79dbf7c8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'd97bcef6e4d2a4bacf335f412488c72e38d590e6'

* commit 'd97bcef6e4d2a4bacf335f412488c72e38d590e6':
  Import revised translations.  DO NOT MERGE
2009-08-18 13:16:14 -07:00
Jack Palevich
f46d7b49b8 am 0ff138d7: (-s ours) am 238f8fe6: Merge change 21652 into donut
Merge commit '0ff138d79c5ac37a6fa70f283d1e06972686fbcf'

* commit '0ff138d79c5ac37a6fa70f283d1e06972686fbcf':
  Make ZoomButtonsController public.
2009-08-18 13:16:11 -07:00
Android Git Automerger
97df3f5aad am 9cefd00f: resolved conflicts for merge of 6ba69734 to eclair, skipping preloaded-classes as pre Bob
Merge commit '9cefd00f83df16f1763eaea08b96569db826e1f2'

* commit '9cefd00f83df16f1763eaea08b96569db826e1f2':
  Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
2009-08-18 13:13:15 -07:00
Eric Fischer
d97bcef6e4 am 79dbf7c8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '79dbf7c8fc910957c9687b863eae97a768d6be60' into eclair

* commit '79dbf7c8fc910957c9687b863eae97a768d6be60':
  Import revised translations.  DO NOT MERGE
2009-08-18 13:11:32 -07:00
Jack Palevich
0ff138d79c am 238f8fe6: Merge change 21652 into donut
Merge commit '238f8fe645271a0ef891553e1c8c3c964c3c876d' into eclair

* commit '238f8fe645271a0ef891553e1c8c3c964c3c876d':
  Make ZoomButtonsController public.
2009-08-18 13:11:08 -07:00
Android Git Automerger
9cefd00f83 resolved conflicts for merge of 6ba69734 to eclair, skipping preloaded-classes as pre Bob 2009-08-18 13:08:40 -07:00
Suchi Amalapurapu
5cc9db4206 am 30c0b834: am d9d25760: Remove dead locks in system process when installing packages
Merge commit '30c0b83490d856c1cd82441c8e2d800a88927237'

* commit '30c0b83490d856c1cd82441c8e2d800a88927237':
  Remove dead locks in system process when installing packages
2009-08-18 13:05:27 -07:00
Suchi Amalapurapu
30c0b83490 am d9d25760: Remove dead locks in system process when installing packages
Merge commit 'd9d2576017fadcf47589b54e8ee198f48cc19352' into eclair

* commit 'd9d2576017fadcf47589b54e8ee198f48cc19352':
  Remove dead locks in system process when installing packages
2009-08-18 13:00:32 -07:00
Andreas Huber
d2f23c959a am 1d3fb679: Merge change 21745 into eclair
Merge commit '1d3fb679af17965dec6b5961e2b9845712b118fd'

* commit '1d3fb679af17965dec6b5961e2b9845712b118fd':
  Refactored "stagefright" commandline app, split off JPEGSource.
2009-08-18 12:55:34 -07:00
Android (Google) Code Review
1d3fb679af Merge change 21745 into eclair
* changes:
  Refactored "stagefright" commandline app, split off JPEGSource.
2009-08-18 12:52:29 -07:00
Amith Yamasani
5a96294e86 am b2229359: Merge change 21748 into eclair
Merge commit 'b22293590cb10b1d8722dbf9c226cb58f240d7d5'

* commit 'b22293590cb10b1d8722dbf9c226cb58f240d7d5':
  Get At command count from Bluetooth headset.
2009-08-18 12:42:04 -07:00
Android (Google) Code Review
b22293590c Merge change 21748 into eclair
* changes:
  Get At command count from Bluetooth headset.
2009-08-18 12:39:34 -07:00
Amith Yamasani
82cb029e2a Get At command count from Bluetooth headset.
Pass in the BT headset object when available to the BatteryStats.
2009-08-18 12:38:06 -07:00
Jeff Hamilton
222a678d43 am 97e47004: Merge change 21716 into eclair
Merge commit '97e470048a9ce703c7192f08a86b0ce0eed00eaa'

* commit '97e470048a9ce703c7192f08a86b0ce0eed00eaa':
  Include the list of registered providers the package manager dumpsys output.
2009-08-18 12:37:41 -07:00
Android (Google) Code Review
97e470048a Merge change 21716 into eclair
* changes:
  Include the list of registered providers the package manager dumpsys output.
2009-08-18 12:33:54 -07:00