Mathias Agopian
7e25da07af
fix KeyedVector::replaceValueAt, which wouldn't even compile if used.
2009-04-10 20:27:25 -07:00
Feng Qian
3d4122c5a2
Merge branch 'readonly-p4-master'
2009-04-10 18:12:55 -07:00
Feng Qian
9ae010a349
AI 145796: Land the WebKit merge @r42026.
...
Automated import of CL 145796
2009-04-10 18:11:32 -07:00
Eric Fischer
68dbdd4d47
AI 145782: Import updated translations.
...
DO NOT MERGE
Automated import of CL 145782
2009-04-10 16:38:00 -07:00
Andy Stadler
5f05afeeb6
Merge branch 'readonly-p4-donut' into donut
2009-04-10 16:26:11 -07:00
Andy Stadler
f8a7ceaef2
AI 145778: Manual merge changes 145382-145384 from cupcake.
...
Automated import of CL 145778
2009-04-10 16:24:47 -07:00
Ficus Kirkpatrick
ed740498ca
Add method on EncodedStringValue to transform a String[].
2009-04-10 15:50:01 -07:00
Yu Shan Emily Lau
0b57d6cdb5
AI 145757: Suppress the flaky tests
...
BUG=174601,1569749
Automated import of CL 145757
2009-04-10 15:28:26 -07:00
Dan Bornstein
960fe37a6a
AI 145743: Excise the "de" locale out of testResourceBundles(), leaving a
...
TODO and long comment about the situation.
BUG=1746810
Automated import of CL 145743
2009-04-10 14:55:08 -07:00
Mathias Agopian
0179ff6594
Merge commit 'goog/master' into master_gl
...
Conflicts:
libs/utils/Parcel.cpp
2009-04-10 14:36:33 -07:00
Mathias Agopian
1473f46cbc
Integrate from //sandbox/mathias/donut/...@145728
...
SurfaceFlinger rework for new EGL driver model support.
2009-04-10 14:24:30 -07:00
Brett Chabot
732bde73f9
AI 145735: Suppress the flaky DatabaseLockTest
...
BUG=1777453
Automated import of CL 145735
2009-04-10 14:13:32 -07:00
Eric Fischer
d7e4475898
AI 145711: Import a few changed translations.
...
DO NOT MERGE
Automated import of CL 145711
2009-04-10 10:45:19 -07:00
Jack Palevich
a8e947f604
Merge branch 'readonly-p4-master'
2009-04-09 19:54:37 -07:00
Jack Palevich
71d83c0489
AI 145639: am: CL 145602 am: CL 145255 Further work on correcting the misspelling of RENDERMODE_CONTUOUSLY
...
--> RENDERMODE_CONTINUOUSLY. This time we update the spelling
in the list of APIs in SDK release 3. (Which hasn't actually been
released yet, so it's OK to do this.)
Original author: jackpal
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 145639
2009-04-09 19:53:26 -07:00
Jack Palevich
3b9ff27e73
Merge branch 'readonly-p4-master'
2009-04-09 19:41:44 -07:00
Jack Palevich
f079c6852f
AI 145633: Manually integrate the RENDER_CONTINUOUSLY change from
...
the donut branch.
BUG=1766678
Automated import of CL 145633
2009-04-09 19:40:24 -07:00
Jack Palevich
69cbb96c88
Merge branch 'readonly-p4-donut' into donut
2009-04-09 18:47:55 -07:00
Jack Palevich
1eb75a0b37
AI 145602: am: CL 145255 Further work on correcting the misspelling of RENDERMODE_CONTUOUSLY
...
--> RENDERMODE_CONTINUOUSLY. This time we update the spelling
in the list of APIs in SDK release 3. (Which hasn't actually been
released yet, so it's OK to do this.)
Original author: jackpal
Merged from: //branches/cupcake/...
Automated import of CL 145602
2009-04-09 18:46:38 -07:00
Jack Palevich
f391664cd2
Merge branch 'readonly-p4-donut' into donut
2009-04-09 18:04:34 -07:00
Jack Palevich
32925df920
AI 145590: Manually merge change 145250 from cupcake.
...
Update API for GLSurfaceView to account for correcting the spelling of a
constant RENDER_CONTINUOUSLY. (This constant is new to Cupcake, so this is not
a breaking API change.)
BUG=1766678
Automated import of CL 145590
2009-04-09 18:03:18 -07:00
Jeffrey Sharkey
5671777ecb
AI 145568: Hide setStarted() from public API.
...
It should be renamed to something more meaninful before being exposed.
BUG=1779168
Automated import of CL 145568
2009-04-09 16:53:25 -07:00
Dianne Hackborn
1c004f0ae1
AI 145561: Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive).
...
BUG=1710534
Automated import of CL 145561
2009-04-09 16:26:49 -07:00
Android (Google) Code Review
fc5c0981ea
Merge change 67 into donut
...
* changes:
Integrate new power connnect/disconnect broadcasts
2009-04-09 16:21:51 -07:00
Dirk Dougherty
9f17a3b006
AI 145559: Cleanup for early-look SDK.
...
Automated import of CL 145559
2009-04-09 16:21:15 -07:00
Christopher Tate
06ba55476e
Integrate new power connnect/disconnect broadcasts
...
Two new broadcasts, Intent.ACTION_POWER_CONNECTED and
Intent.ACTION_POWER_CONNECTED, that are issued when the device is plugged
and unplugged from USB or AC power. This pulls two changes from the
open-source Gerrit repo into the internal Donut codeline:
1241 fda6fae Added broadcasts for external power events.
9491 37f8ca1 Fix system service crash when booting while on battery power
The current.xml API description has also been updated to include the
new Intent fields; the new API was approved in the original OSS change.
2009-04-09 16:03:56 -07:00
Dave Bort
2faf6081f2
Remove references to android.util.Config
...
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.
BUG=1780938
2009-04-09 15:30:38 -07:00
Dave Bort
fb83907291
Remove references to android.util.Config
...
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.
BUG=1780938
2009-04-09 15:18:48 -07:00
Fred Quintana
546f75c5c5
Merge branch 'readonly-p4-master'
2009-04-09 15:07:04 -07:00
Fred Quintana
26fc5eba50
AI 145535: reenable the signin notifications
...
the system process has permissions to control this
notification but the caller doesn't do we need to call
clearCallerIdentity() before manipulating the notification
BUG=1778648
Automated import of CL 145535
2009-04-09 15:05:50 -07:00
Jack Palevich
8ecf3b8763
Merge branch 'readonly-p4-master'
2009-04-09 15:04:22 -07:00
Jack Palevich
3e832dbe96
AI 145534: am: CL 145526 am: CL 145249 Correct misspelling of constant RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY
...
Original author: jackpal
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 145534
2009-04-09 15:03:04 -07:00
Jack Palevich
5309124aa3
Merge branch 'readonly-p4-donut' into donut
2009-04-09 15:01:54 -07:00
Jack Palevich
b1970201ec
AI 145526: am: CL 145249 Correct misspelling of constant RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY
...
Original author: jackpal
Merged from: //branches/cupcake/...
Automated import of CL 145526
2009-04-09 15:00:37 -07:00
Jack Palevich
9f4d38d396
Merge branch 'readonly-p4-master'
2009-04-09 14:55:24 -07:00
Jack Palevich
b47c641fe8
AI 145531: am: CL 145523 am: CL 145244 Fully document GLSurfaceView and related classes.
...
Original author: jackpal
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 145531
2009-04-09 14:54:12 -07:00
Jack Palevich
4d08efb7d8
Merge branch 'readonly-p4-donut' into donut
2009-04-09 14:52:42 -07:00
Jack Palevich
23cda69aaa
AI 145523: am: CL 145244 Fully document GLSurfaceView and related classes.
...
Original author: jackpal
Merged from: //branches/cupcake/...
Automated import of CL 145523
2009-04-09 14:51:25 -07:00
Dave Bort
cfe6524071
Remove references to android.util.Config
...
The semantics of Config.DEBUG will be changing soon, and all other
Config.* fields will become deprecated/hidden.
2009-04-09 14:51:04 -07:00
Eric Fischer
2984f14244
Merge branch 'readonly-p4-donut' into donut
2009-04-09 14:33:58 -07:00
Eric Fischer
af64013eca
Merge branch 'readonly-p4-master'
2009-04-09 14:33:10 -07:00
Eric Fischer
2dcaf4ee66
AI 145493: am: CL 145214 Update cupcake translations.
...
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 145493
2009-04-09 14:32:41 -07:00
Eric Fischer
580b13017e
AI 145500: am: CL 145493 am: CL 145214 Update cupcake translations.
...
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 145500
2009-04-09 14:31:52 -07:00
Dianne Hackborn
d6cbabfa77
AI 145384: API review: these didn't specify a protection level.
...
I realized that the package parse is not requiring android:protectionLevel on a permission, even though it was intended to do that. As a result, some new permissions slipped by without specifying it. Now they do. Also the mock providers is marked as dangerous, so the user will be informed of it (normal apps should never request it).
In the next release we can fix this to always require the protection level.
BUG=1780749
Automated import of CL 145384
2009-04-09 12:34:01 -07:00
Dianne Hackborn
48276ab989
AI 145383: API review: clean up a bunch of @hides that have been pending API review.
...
Either expose them, or official hide them with an explanation for why.
BUG=1779439
Automated import of CL 145383
2009-04-09 12:32:19 -07:00
Dianne Hackborn
5eabbd9f27
AI 145382: API review: change new media keycode names to avoid ambiguity.
...
Updates the key maps. During this I noticed that the dream keymap didn't have all of the media buttons like the sapphire key map...! So this is now changed to match.
BUG=1779435
Automated import of CL 145382
2009-04-09 12:31:13 -07:00
Jack Palevich
d6fbffe6ea
AI 145255: Further work on correcting the misspelling of RENDERMODE_CONTUOUSLY
...
--> RENDERMODE_CONTINUOUSLY. This time we update the spelling
in the list of APIs in SDK release 3. (Which hasn't actually been
released yet, so it's OK to do this.)
BUG=1766678
Automated import of CL 145255
2009-04-08 20:33:03 -07:00
Jack Palevich
62d4be411e
AI 145250: Update API for GLSurfaceView to account for correcting the spelling of a
...
constant RENDER_CONTINUOUSLY. (This constant is new to Cupcake, so this is not
a breaking API change.)
BUG=1766678
Automated import of CL 145250
2009-04-08 19:41:04 -07:00
Jack Palevich
93f411386a
AI 145249: Correct misspelling of constant RENDERMODE_CONTUOUSLY --> RENDERMODE_CONTINUOUSLY
...
BUG=1766678
Automated import of CL 145249
2009-04-08 19:28:00 -07:00
Nick Pelly
3267062d9c
Merge branch 'readonly-p4-master'
2009-04-08 19:24:05 -07:00