drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,147 Commits 1 Branch 0 Tags
Commit Graph

1147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yu Shan Emily Lau
bf91524120 AI 145971: am: CL 145757 Suppress the flaky tests 
Original author: yslau
  Merged from: //branches/cupcake/...

Automated import of CL 145971
 2009-04-13 16:08:09 -07:00
Dan Bornstein
17e2860fcc Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:06:39 -07:00
Dan Bornstein
43ed2b3ac4 AI 145970: am: CL 145743 Excise the "de" locale out of testResourceBundles(), leaving a 
TODO and long comment about the situation.
  Original author: danfuzz
  Merged from: //branches/cupcake/...

Automated import of CL 145970
 2009-04-13 16:05:22 -07:00
Brett Chabot
895e102003 Merge branch 'readonly-p4-donut' into donut 2009-04-13 16:03:16 -07:00
Brett Chabot
5f75015fef AI 145969: am: CL 145735 Suppress the flaky DatabaseLockTest 
Original author: brettchabot
  Merged from: //branches/cupcake/...

Automated import of CL 145969
 2009-04-13 16:01:56 -07:00
Dave Bort
b1d0403c66 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-13 15:12:30 -07:00
Dave Bort
42bc2ff5d2 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-13 15:10:38 -07:00
Mathias Agopian
77307ab848 Merge commit 'goog/master' into master_gl 2009-04-13 14:31:08 -07:00
Android (Google) Code Review
61805637e5 Merge change 65 into donut 
* changes:
  Remove references to android.util.Config
 2009-04-13 14:13:14 -07:00
Android (Google) Code Review
2ee5b4d82b Merge change 64 into donut 
* changes:
  Remove references to android.util.Config
 2009-04-13 14:13:00 -07:00
Android (Google) Code Review
0887540fa8 Merge change 63 into donut 
* changes:
  Remove references to android.util.Config
 2009-04-13 14:12:27 -07:00
Grace Kloba
0f87ca2037 Merge branch 'readonly-p4-master' 2009-04-13 14:05:40 -07:00
Grace Kloba
b3230cb1e3 AI 145922: Fix #1640053, #1777704. When WebKit set scroll position through jni, we need to check whether there is a pending draw as the scroll position should be based on the new picture, not the current picture. 
BUG=1640053,1777704

Automated import of CL 145922
 2009-04-13 14:04:23 -07:00
Lorenzo Colitti
b7c3675aef Merge branch 'readonly-p4-donut' into donut 2009-04-13 13:54:13 -07:00
Lorenzo Colitti
e8624dd69d AI 145920: Don't filter out IPv6 multicast packets. 
Automated import of CL 145920
 2009-04-13 13:52:55 -07:00
Ramanan Rajeswaran
5320e896e2 AI 145892: Add Ireland, Switzerland, New Zealand, South Africa to MccTable 
BUG=1786030

Automated import of CL 145892
 2009-04-13 11:19:51 -07:00
Eric Shienbrood
18b4d49065 AI 145881: Adding on to CL 145383, unhiding some additional methods and constants 
that ought to be exposed. Hid and deprecated the single-arg public
  constructor for NetworkInfo, and modified a CTS test that was testing it.
  Ran the android.net test package to make sure it still works.
  BUG=1779439

Automated import of CL 145881
 2009-04-13 10:41:56 -07:00
Patrick Scott
9536d0b413 Merge branch 'readonly-p4-master' 2009-04-13 09:59:09 -07:00
Patrick Scott
3156bb00dd AI 145870: Add a build property for the default alarm alert. Update the various 
framework classes to deal with the new property. Also update various
  documentation that mentions the default ringtones.
  Use the build property as the default alert when the user has not chosen
  an alert for an alarm. This is also used if the alarm alert is null when
  the alarm fires.
  BUG=1723684

Automated import of CL 145870
 2009-04-13 09:57:38 -07:00
Jeffrey Sharkey
d5a9af45ff Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:56:31 -07:00
Jeffrey Sharkey
7eb4fbdbb6 AI 145860: am: CL 145568 Hide setStarted() from public API. 
It should be renamed to something more meaninful before being exposed.
  Original author: jsharkey
  Merged from: //branches/cupcake/...

Automated import of CL 145860
 2009-04-13 08:55:24 -07:00
Dianne Hackborn
1710799c47 Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:53:57 -07:00
Dianne Hackborn
06f36b401d AI 145859: am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive). 
Original author: hackbod
  Merged from: //branches/cupcake/...

Automated import of CL 145859
 2009-04-13 08:52:45 -07:00
Dirk Dougherty
210ae8c375 Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:51:20 -07:00
Dirk Dougherty
baf49ae7d0 AI 145858: am: CL 145559 Cleanup for early-look SDK. 
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 145858
 2009-04-13 08:50:07 -07:00
Mathias Agopian
af9a515299 more debugging tools around BufferMapper 2009-04-10 20:34:46 -07:00
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