Android (Google) Code Review
c24e09c31b
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
89310de68d
Merge change 21790 into eclair
...
* changes:
Dormant ICON was not being displayed, fixes bug 2039239.
2009-08-18 15:41:14 -07:00
Android (Google) Code Review
8eb1f64827
Merge change 21770 into eclair
...
* changes:
Fix issue #2047139 : Remove Service.setForeground()
2009-08-18 14:15:38 -07:00
Xavier Ducrohet
f82d305f92
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
Android (Google) Code Review
e124d76caf
Merge change 21772 into donut
...
* changes:
Fix Resources#opeRawResource(int, TypedValue) in layoutlib.
2009-08-18 13:39:50 -07:00
Eric Fischer
0e4e769432
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
43f8680eb8
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
920f3d885a
resolved conflicts for merge of 6ba69734 to eclair, skipping preloaded-classes as pre Bob
2009-08-18 13:08:40 -07:00
Suchi Amalapurapu
918428162f
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
Android (Google) Code Review
2811bc6b7c
Merge change 21745 into eclair
...
* changes:
Refactored "stagefright" commandline app, split off JPEGSource.
2009-08-18 12:52:29 -07:00
Android (Google) Code Review
3de0d5e71f
Merge change 21748 into eclair
...
* changes:
Get At command count from Bluetooth headset.
2009-08-18 12:39:34 -07:00
Android (Google) Code Review
560234512c
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
Android (Google) Code Review
66ca93e3b5
Merge change 21754 into eclair
...
* changes:
E911 call fix in ECM
2009-08-18 12:12:27 -07:00
Android (Google) Code Review
9855a56363
Merge change 21750 into eclair
...
* changes:
Tweak the galaxy
2009-08-18 11:39:43 -07:00
Android (Google) Code Review
61f4d0a5b4
Merge change 21728 into eclair
...
* changes:
removing old gears code and correcting simple method typo
2009-08-18 11:24:04 -07:00
Android (Google) Code Review
f8e8a6e23a
Merge change 21727 into eclair
...
* changes:
Fix missing -lpthread in linux-sim build.
2009-08-18 11:05:58 -07:00
Xavier Ducrohet
3a70310ed8
am ace6a5cf: Merge change 21408 into donut
...
Merge commit 'ace6a5cfc0d14a909b4b95bdfe16609188125baf' into eclair
* commit 'ace6a5cfc0d14a909b4b95bdfe16609188125baf':
Improved drawing/matrix support in layoutlib
2009-08-18 11:01:19 -07:00
Jasperln
b46530ceac
am f5e6a211: Merge change 21572 into donut
...
Merge commit 'f5e6a211b16e26104b6fb2d32ef4eabbf9fbc2d1' into eclair
* commit 'f5e6a211b16e26104b6fb2d32ef4eabbf9fbc2d1':
Add constants to adjust Vending input and output buffer sizes.
2009-08-18 11:01:11 -07:00
Eric Fischer
402a381db2
am 093918a6: (-s ours) Merge change 21549 into donut
...
Merge commit '093918a62818c6bb176921928d2ca7a22857ec9b' into eclair
* commit '093918a62818c6bb176921928d2ca7a22857ec9b':
Import revised translations. DO NOT MERGE
2009-08-18 11:00:28 -07:00
Dianne Hackborn
fb8312cdab
am c678a93a: Fix issue #2056585 : applications can put phone in inconsistent state wrt airplane mode
...
Merge commit 'c678a93a73c83e841032874bee9c202936da73c0' into eclair
* commit 'c678a93a73c83e841032874bee9c202936da73c0':
Fix issue #2056585 : applications can put phone in inconsistent state wrt airplane mode
2009-08-18 11:00:16 -07:00
Mike LeBeau
5b94900b92
am cfa419b7: Correct comments for startSearch in Activity and SearchManager to explain Donut behavior correctly.
...
Merge commit 'cfa419b754332e12f8cd45244c2f3bee9d6a74bb' into eclair
* commit 'cfa419b754332e12f8cd45244c2f3bee9d6a74bb':
Correct comments for startSearch in Activity and SearchManager to explain
2009-08-18 10:59:53 -07:00
Jean-Michel Trivi
ed9395301d
am d5884a9b: Merge change 21358 into donut
...
Merge commit 'd5884a9ba45e58294c09fd2747c87d761b9daee5' into eclair
* commit 'd5884a9ba45e58294c09fd2747c87d761b9daee5':
Unhide the broadcast intent that signals completion of the TTS language
2009-08-18 10:59:20 -07:00
Suchi Amalapurapu
d9e3dc2294
am 75c49842: Add maxSdkVersion information in dump badging option
...
Merge commit '75c498426a17b47d445711bb9e36794b05876a56' into eclair
* commit '75c498426a17b47d445711bb9e36794b05876a56':
Add maxSdkVersion information in dump badging option
2009-08-18 10:59:08 -07:00
Android (Google) Code Review
2ab19ffecf
Merge change 21468 into eclair
...
* changes:
Couple of fixes for viewport.
2009-08-18 10:51:49 -07:00
Android (Google) Code Review
6b19166880
Merge change 21634 into eclair
...
* changes:
Add new calendar database columns; do not merge (cherry-picked 1fa64)
2009-08-18 10:29:43 -07:00
Android (Google) Code Review
cebcf027f9
Merge change 21221 into eclair
...
* changes:
Modify svc power command so it pokes the wake lock when called. This will ensure screen is not asleep if stayon is requested.
2009-08-18 09:59:40 -07:00
Xavier Ducrohet
d06a4233e6
am c1c432f5: Merge change 21241 into donut
...
Merge commit 'c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839' into eclair
* commit 'c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839':
Layoutlib now uses the dimen status_bar_height instead of hard-coded value
2009-08-18 08:44:59 -07:00
Jean-Michel Trivi
182facc9cb
am 0950c5de: Merge change 21226 into donut
...
Merge commit '0950c5de864d1ad83ed96efc5c2d1569b4d36188' into eclair
* commit '0950c5de864d1ad83ed96efc5c2d1569b4d36188':
Fix bug 2046705 where the output of the speech synthesizer is too low.
2009-08-18 08:44:51 -07:00
Jean-Baptiste Queru
2dac629740
am c8ab08aa: Merge change 21124 into donut
...
Merge commit 'c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd' into eclair
* commit 'c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd':
Add license-related files
2009-08-18 08:44:43 -07:00
Scott Main
24df9c35cf
am ba52b3e0: Merge change 21149 into donut
...
Merge commit 'ba52b3e08b33592457242944f7a89691a5b94880' into eclair
* commit 'ba52b3e08b33592457242944f7a89691a5b94880':
DOCS ONLY.
2009-08-18 08:44:38 -07:00
Android (Google) Code Review
80e8128fa1
Merge change 21648 into eclair
...
* changes:
Remove the hack to include Gears as it is gone now.
2009-08-18 08:44:18 -07:00
Android (Google) Code Review
7559a91343
Merge change 21326 into eclair
...
* changes:
aapt now attempts to process all assets even if some are malformed.
2009-08-18 07:20:06 -07:00
Android (Google) Code Review
be46db7c63
Merge change 21601 into eclair
...
* changes:
BatteryService: Add support for new standard battery voltage and temperature attributes.
2009-08-18 06:03:47 -07:00
Android (Google) Code Review
bf2a8d2201
Merge change 21646 into eclair
...
* changes:
fix bug [2021677] egl driver unloaded after eglTerminate() is called
2009-08-18 00:27:16 -07:00
Android (Google) Code Review
6d11289cc8
Merge change 21660 into eclair
...
* changes:
Optimized Galaxy
2009-08-17 20:00:32 -07:00
Android (Google) Code Review
972bd08dff
Merge change 21655 into eclair
...
* changes:
resolved conflicts for merge of 696b912e to eclair
2009-08-17 19:21:49 -07:00
johnwang
ecc0defdd8
resolved conflicts for merge of 696b912e to eclair
...
modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
2009-08-17 19:20:07 -07:00
Android (Google) Code Review
4789a744fe
Merge change 21653 into eclair
...
* changes:
Remove global IO context and integrate it into the RS context.
2009-08-17 18:40:38 -07:00
Android (Google) Code Review
9de810c7d3
Merge change 21652 into donut
...
* changes:
Make ZoomButtonsController public.
2009-08-17 18:38:53 -07:00
Android (Google) Code Review
d74454e708
Merge change 21637 into eclair
...
* changes:
Fix 2058938. As zoom control is uesd in overview mode to switch to reading mode, we also want to hide it after double tap is done.
2009-08-17 18:18:44 -07:00
Mathias Agopian
923c661a86
fix bug [2021677] egl driver unloaded after eglTerminate() is called
...
refactored the code so that:
- EGL APIs that can be called before or after eglInitialize() will work by loading the drivers first
- make eglGetDisplay() a lot more efficient
- make sure that EGL drivers are loaded in a thread-safe way
- don't unload the drivers upon calling eglTerminate(), they're now never unloaded, since there is no safe way to do it (some thread could be running)
- updated our EGL version to 1.4
- return better error codes if errors happen during initialization
2009-08-17 18:07:06 -07:00
Android (Google) Code Review
ec1ddffd0a
Merge change 21178 into donut
...
* changes:
Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
2009-08-17 17:58:05 -07:00
Android (Google) Code Review
43e16541d7
Merge change 21638 into eclair
...
* changes:
Don't use BoringLayout to display text that has paragraph-style markup.
2009-08-17 17:24:47 -07:00
Android (Google) Code Review
10843106c3
Merge change 21576 into eclair
...
* changes:
Support for marshalling pointers / intptr_t in Parcel.
2009-08-17 16:39:43 -07:00
Android (Google) Code Review
098bd4b1a9
Merge change 21581 into eclair
...
* changes:
Fix CDMA to startup/shutdown based on apn en/disab
2009-08-17 15:48:01 -07:00
Android (Google) Code Review
f0eab03a5f
Merge change 21516 into eclair
...
* changes:
Update docs: readFromParcel() is not necessary to make a class support Parcelable.
2009-08-17 15:38:14 -07:00
Andreas Huber
84a6d041e2
Support for marshalling pointers / intptr_t in Parcel.
...
Some refactoring to eliminate code duplication in Parcel implementation.
2009-08-17 15:31:25 -07:00
Android (Google) Code Review
91f17997dd
Merge change 21603 into eclair
...
* changes:
Fix infinite recursion.
2009-08-17 15:25:23 -07:00
Android (Google) Code Review
7f87b14a5b
Merge change 21587 into eclair
...
* changes:
BatteryService: Remove hard coded power supply names.
2009-08-17 14:26:06 -07:00
Android (Google) Code Review
70d7a28826
Merge change 21408 into donut
...
* changes:
Improved drawing/matrix support in layoutlib
2009-08-17 14:22:24 -07:00