Mathias Agopian
84ef0d237a
am 7193a587: Merge change 21401 into eclair
...
Merge commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836'
* commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836':
make sure to update a surface's usage bits when it changes, instead of only the first time.
2009-08-14 20:11:09 -07:00
Android (Google) Code Review
6df76d698b
Merge change 21401 into eclair
...
* changes:
make sure to update a surface's usage bits when it changes, instead of only the first time.
2009-08-14 20:07:51 -07:00
Mathias Agopian
ba5972ffdc
make sure to update a surface's usage bits when it changes, instead of only the first time.
...
also fixed a few locking issues in Surface and commented how each member is protected.
2009-08-14 18:52:17 -07:00
Mike Lockwood
734fff252a
am 82726f04: Merge change 21298 into eclair
...
Merge commit '82726f045de91b899502a54ca76d234c43a1ba4b'
* commit '82726f045de91b899502a54ca76d234c43a1ba4b':
ConnectivityService: Do not send broadcasts until the system is ready.
2009-08-14 18:45:40 -07:00
Android (Google) Code Review
7b9bf05445
Merge change 21298 into eclair
...
* changes:
ConnectivityService: Do not send broadcasts until the system is ready.
2009-08-14 18:41:56 -07:00
Wei Huang
5907379bd2
am c650bf58: Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.
...
Merge commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8'
* commit 'c650bf583dbed8701da9a49b9dbd9023768f0df8':
Get rid of Settings.getJIDResource(), which really should live in GTalkService. Add API to store the JID resource in IM provider settings.
2009-08-14 17:00:02 -07:00
Dmitri Plotnikov
8cba8c612e
am adb4a72d: Merge change 21364 into eclair
...
Merge commit 'adb4a72d7bcf7351e76ca722b1a9c2a1d5a0d55e'
* commit 'adb4a72d7bcf7351e76ca722b1a9c2a1d5a0d55e':
Moving contacts-specific strings to donottranslate files.
2009-08-14 16:07:59 -07:00
Android (Google) Code Review
e79366b4f9
Merge change 21364 into eclair
...
* changes:
Moving contacts-specific strings to donottranslate files.
2009-08-14 16:04:29 -07:00
Sahil Sachdeva
edaa14474a
am c9706f02: (-s ours) DO NOT MERGE, ALready merged to master. 1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
...
Merge commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069'
* commit 'c9706f0262a2f399f95e0d78ba2b7616e08d0069':
DO NOT MERGE, ALready merged to master.
2009-08-14 15:38:30 -07:00
Mike Reed
0356af48c1
am 87224294: Merge change 21311 into eclair
...
Merge commit '872242948184d7b6fed8b127d8ba8386487dc826'
* commit '872242948184d7b6fed8b127d8ba8386487dc826':
fix documentation
2009-08-14 15:13:20 -07:00
Dianne Hackborn
9a909211d1
am 410676bb: Merge change 21307 into eclair
...
Merge commit '410676bbac107726499589b665ef61e3d47355ab'
* commit '410676bbac107726499589b665ef61e3d47355ab':
Turn off static live wallpaper for now.
2009-08-14 15:13:18 -07:00
Leon Scroggins
d9c2fc3c32
am f58ffac2: Hide the title bar when zoomed in.
...
Merge commit 'f58ffac202b5a15f4bbfd5512c58f202a992f594'
* commit 'f58ffac202b5a15f4bbfd5512c58f202a992f594':
Hide the title bar when zoomed in.
2009-08-14 15:13:15 -07:00
Android (Google) Code Review
3f423abdee
Merge change 21311 into eclair
...
* changes:
fix documentation
2009-08-14 12:38:51 -07:00
Android (Google) Code Review
6e1e68a7e0
Merge change 21307 into eclair
...
* changes:
Turn off static live wallpaper for now.
2009-08-14 12:24:02 -07:00
Android (Google) Code Review
5b9091f02c
Merge change 21018
...
* changes:
1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
2009-08-14 12:08:34 -07:00
Android (Google) Code Review
251d1eb9a4
Merge change 21154
...
* changes:
PowerManager: Fix problem waking screen from negative proximity sensor events.
2009-08-14 09:46:06 -07:00
Steve Block
d8b8937054
am a8dfe24d: Adds the ability to configure the mock Geolocation service from DumpRenderTree.
...
Merge commit 'a8dfe24da014b52d7ae93c3fbd7a8b88ec336572'
* commit 'a8dfe24da014b52d7ae93c3fbd7a8b88ec336572':
Adds the ability to configure the mock Geolocation service from DumpRenderTree.
2009-08-14 09:39:21 -07:00
Patrick Scott
e90d87e3d0
am 68e53004: The local loaders assume the url given to them is decoded.
...
Merge commit '68e530047786b4f9d219d17652d7429e6e5a21bd'
* commit '68e530047786b4f9d219d17652d7429e6e5a21bd':
The local loaders assume the url given to them is decoded.
2009-08-14 05:19:03 -07:00
Android (Google) Code Review
facf63b9b6
Merge change 21073
...
* changes:
Log more information to help us debug which ListView has IllegalStateException in monkey tests. (bug 1995826)
2009-08-13 23:41:58 -07:00
Mathias Agopian
518ed51eb7
am a31deaf4: Merge change 21225 into eclair
...
Merge commit 'a31deaf4a960058e533da35d6229f7aa8d4f00c1'
* commit 'a31deaf4a960058e533da35d6229f7aa8d4f00c1':
fix a bug that could cause a window to be hidden in some cases.
2009-08-13 22:39:56 -07:00
Android (Google) Code Review
b2125c68f9
Merge change 21225 into eclair
...
* changes:
fix a bug that could cause a window to be hidden in some cases.
2009-08-13 22:36:05 -07:00
Jared Suttles
9cdd7677de
am 185a5133: Merge change 21235 into eclair
...
Merge commit '185a5133cf4c805d3996a7f8fc3912a072f60f18'
* commit '185a5133cf4c805d3996a7f8fc3912a072f60f18':
Change the number of volume steps from 6 to 7 per Verizon Requirements
2009-08-13 21:40:45 -07:00
Android (Google) Code Review
fe39f47892
Merge change 21235 into eclair
...
* changes:
Change the number of volume steps from 6 to 7 per Verizon Requirements
2009-08-13 21:33:57 -07:00
Dianne Hackborn
e70eab8e1a
am 0cd48879: A little more wallpaper robustness.
...
Merge commit '0cd48879dca53a9f4d449126d406527bc4b94baf'
* commit '0cd48879dca53a9f4d449126d406527bc4b94baf':
A little more wallpaper robustness.
2009-08-13 19:28:29 -07:00
Mathias Agopian
d66a97950e
fix a bug that could cause a window to be hidden in some cases.
...
this would happen is the window is made visible but the client didn't render yet into it. This happens often with SurfaceView.
Instead of filling the window with solid black, SF would simply ignore it which could lead to more disturbing artifacts.
in theory the window manager should not display a window before it has been drawn into, but it does happen occasionnaly.
2009-08-13 19:08:00 -07:00
Xavier Ducrohet
fc52390b57
am 1d47a514: am 94ff3f1f: Merge change 21063 into donut
...
Merge commit '1d47a5142682c1f9f9a04fdbe1ec863fd5550c30'
* commit '1d47a5142682c1f9f9a04fdbe1ec863fd5550c30':
Fix handling of reference XML file in layout files
2009-08-13 19:01:18 -07:00
Xavier Ducrohet
72b297bfb8
am 314e0226: am e1b63d22: Merge change 21033 into donut
...
Merge commit '314e0226a26cd79b5080dcb76d566fa6f83ff695'
* commit '314e0226a26cd79b5080dcb76d566fa6f83ff695':
Mock ServiceManager and AccesibilityManager to make the view renders in ADT
2009-08-13 19:01:15 -07:00
Mathias Agopian
4a16a43b77
am f2339150: be more friendly with C
...
Merge commit 'f233915016a9053c23af6e4bceb319e7140f71bc'
* commit 'f233915016a9053c23af6e4bceb319e7140f71bc':
be more friendly with C
2009-08-13 19:01:12 -07:00
Mathias Agopian
a5388f8de9
am 317a6280: Surface::GPU and Surface::HARDWARE are now deprecated; they will be set automatically if needed.
...
Merge commit '317a6280cc109e873646e4652be1582d870eedfd'
* commit '317a6280cc109e873646e4652be1582d870eedfd':
Surface::GPU and Surface::HARDWARE are now deprecated; they will be set automatically if needed.
2009-08-13 19:01:10 -07:00
Dianne Hackborn
09fcf8504a
am 81655243: Merge change 21207 into eclair
...
Merge commit '81655243a6a373cfde1e689970eeb62af19622d1'
* commit '81655243a6a373cfde1e689970eeb62af19622d1':
Always have a wallpaper service running.
2009-08-13 19:01:07 -07:00
Dima Zavin
68b327b053
am 8db93389: ui: make native_window_set_usage be a static inline
...
Merge commit '8db93389141fbce1e37f4c22f415fc2cebf19ebf'
* commit '8db93389141fbce1e37f4c22f415fc2cebf19ebf':
ui: make native_window_set_usage be a static inline
2009-08-13 19:01:04 -07:00
Xavier Ducrohet
d199c59a15
am 94ff3f1f: Merge change 21063 into donut
...
Merge commit '94ff3f1f08805b68c5524b39024968aebcdc83ee' into eclair
* commit '94ff3f1f08805b68c5524b39024968aebcdc83ee':
Fix handling of reference XML file in layout files
2009-08-13 18:43:54 -07:00
Xavier Ducrohet
4cfb1a09f5
am e1b63d22: Merge change 21033 into donut
...
Merge commit 'e1b63d224a0a68191f087186c470cde317e3fa76' into eclair
* commit 'e1b63d224a0a68191f087186c470cde317e3fa76':
Mock ServiceManager and AccesibilityManager to make the view renders in ADT
2009-08-13 18:43:46 -07:00
Android (Google) Code Review
3ae0232d42
Merge change 20918
...
* changes:
Wrap up the stress test into a single script make test_restore.sh return a value signifying success or failure
2009-08-13 18:35:40 -07:00
Mathias Agopian
238a66e67b
be more friendly with C
2009-08-13 18:27:10 -07:00
Mathias Agopian
ccde199f7c
Surface::GPU and Surface::HARDWARE are now deprecated; they will be set automatically if needed.
...
this also ripples into the window manager API by making some constant there deprecated as well.
2009-08-13 18:19:32 -07:00
Android (Google) Code Review
400f18045a
Merge change 21207 into eclair
...
* changes:
Always have a wallpaper service running.
2009-08-13 17:59:39 -07:00
Dima Zavin
fae3e73b61
ui: make native_window_set_usage be a static inline
...
Signed-off-by: Dima Zavin <dima@android.com>
2009-08-13 16:52:24 -07:00
Android (Google) Code Review
3bca35a3f4
Merge change 21171
...
* changes:
Allow max_retires to be set to infinite.
2009-08-13 15:14:12 -07:00
Android (Google) Code Review
5f1b714107
Merge change 21166
...
* changes:
Rename bcdByteToInt to gsmBcdByteToInt and beBcdByteToInt to cdmaBcdByteToInt.
2009-08-13 15:13:58 -07:00
Android (Google) Code Review
9f24d1909a
Merge change 21186
...
* changes:
Trigger data connection update if network type changes.
2009-08-13 15:13:47 -07:00
Android (Google) Code Review
26f1b02e40
Merge change 21162
...
* changes:
more support for bindStatic some minor tweaks to the layout in the hopes I can start using this for gtalk soon
2009-08-13 15:00:34 -07:00
Android (Google) Code Review
dcafea8bbc
Merge change 21185
...
* changes:
Set V8 flag --expose_gc in TestShellActivity.
2009-08-13 14:58:43 -07:00
Android (Google) Code Review
f87350d530
Merge change 21159
...
* changes:
Allow overlays to add resources.
2009-08-13 14:34:27 -07:00
Android (Google) Code Review
8f4dd17f46
Merge change 21152
...
* changes:
Implement named slots and convert script.addType to script.setType to remove ordering restrictions.
2009-08-13 14:18:52 -07:00
Android (Google) Code Review
a0884b5726
Merge change 21134
...
* changes:
Add a more compact representation of usage stats.
2009-08-13 14:04:37 -07:00
Android (Google) Code Review
d8b9346a1f
Merge change 20853
...
* changes:
Add net type to mobile for mobile-required traffic
2009-08-13 14:02:08 -07:00
Android (Google) Code Review
663f5afffa
Merge change 21158
...
* changes:
Add brackets, braces, and backslash to alt-space character entry popup.
2009-08-13 13:41:15 -07:00
Android (Google) Code Review
2c47f20ea4
Merge change 21153
...
* changes:
Increase search radius for adjacent keys, to reduce unpredictability of suggestions.
2009-08-13 13:02:56 -07:00
Android (Google) Code Review
c44e33888b
Merge change 21100 into donut
...
* changes:
Use dataRoaming in dataConnectionTracker.
2009-08-13 12:36:22 -07:00