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
d8548a9b1a
Merge change 21063 into donut
...
* changes:
Fix handling of reference XML file in layout files
2009-08-13 11:31:07 -07:00
Android (Google) Code Review
9b1edf079b
Merge change 21033 into donut
...
* changes:
Mock ServiceManager and AccesibilityManager to make the view renders in ADT
2009-08-13 11:13:46 -07:00
Benny Wong
4c8fb0a184
Modified the camera HAL interface to use the same generic callback architecture as camera services
2009-08-13 10:46:28 -07:00
Android (Google) Code Review
1689746b11
Merge change 21090
...
* changes:
remove Gears
2009-08-13 10:33:36 -07:00
Android (Google) Code Review
326766d722
Merge change 21106
...
* changes:
In the simulator, make sure that the preview thread is a Java thread, since we won't be going through the binder in single process mode.
2009-08-13 09:46:29 -07:00
Marco Nelissen
7907df75e0
In the simulator, make sure that the preview thread is a Java thread,
...
since we won't be going through the binder in single process mode.
2009-08-13 09:24:47 -07:00
Dianne Hackborn
8267404b11
resolved conflicts for merge of 4431a065 to master
2009-08-12 21:58:34 -07:00
Android (Google) Code Review
86e9d9d426
Merge change 21044
...
* changes:
Add new API to compare certs of two UIDs.
2009-08-12 21:53:24 -07:00
Android (Google) Code Review
33932415a3
Merge change 21055 into donut
...
* changes:
Lock in final resource identifiers.
2009-08-12 21:36:22 -07:00
Mike LeBeau
7e322de186
am c41dca14: Merge change 21045 into donut
...
Merge commit 'c41dca14ee9a9513e547a54a6356b4dab41d781c'
* commit 'c41dca14ee9a9513e547a54a6356b4dab41d781c':
Last minute change: Replace default app icon with a prettier one - droid on a software box sort of thing. :)
2009-08-12 21:36:16 -07:00
Mike LeBeau
f545ce2b11
am 370e1f74: Merge change 21038 into donut
...
Merge commit '370e1f7439fd2688220bfc9615ea70fa3d397cea'
* commit '370e1f7439fd2688220bfc9615ea70fa3d397cea':
Propagate info about whether a "call" command was issued in RecognitionResult.
2009-08-12 21:36:09 -07:00
Android (Google) Code Review
0256b71d85
Merge change 21060
...
* changes:
resolved conflicts for merge of 6550076f to master
2009-08-12 21:35:04 -07:00
Dianne Hackborn
cb60907a5a
resolved conflicts for merge of 6550076f to master
2009-08-12 21:32:10 -07:00
Android (Google) Code Review
5eb77d68b3
Merge change 21059
...
* changes:
make sure EGL_ANDROID_swap_rectangle is actually supported before using it
2009-08-12 21:25:15 -07:00
Mathias Agopian
8458a3140f
make sure EGL_ANDROID_swap_rectangle is actually supported before using it
2009-08-12 21:24:53 -07:00
Android (Google) Code Review
153e4a4c2a
Merge change 21057
...
* changes:
Better error handling in EGL extensions
2009-08-12 21:18:35 -07:00
Mathias Agopian
24e5f52901
Better error handling in EGL extensions
2009-08-12 21:18:15 -07:00
Android (Google) Code Review
15fb629841
Merge change 21047
...
* changes:
Fix build break.
2009-08-12 18:51:46 -07:00