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

1143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Android (Google) Code Review
a6c6f06b07 Merge change 186 into donut 
* changes:
  eliminate seemingly pointless conversion to and then from hex string
 2009-04-15 12:13:07 -07:00
Dirk Dougherty
7cf6fa727a Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:35:03 -07:00
Dirk Dougherty
2fd2f6e5c6 AI 146345: am: CL 146341 g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change) 
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146345
 2009-04-15 11:33:48 -07:00
Dirk Dougherty
e9a65c3a4a Merge branch 'readonly-p4-donut' into donut 2009-04-15 11:32:07 -07:00
Dirk Dougherty
adb538b52f AI 146343: am: CL 146340 Integrate updated SDK Terms and Conditions document 
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 146343
 2009-04-15 11:30:46 -07:00
Dirk Dougherty
d9671b8e05 AI 146341: g4 integrate -t -i -b platform-1_0-to-cupcake @146018,146018 (doc change) 
BUG=1675368

Automated import of CL 146341
 2009-04-15 11:29:53 -07:00
Dirk Dougherty
b01b0cb4b6 AI 146340: Integrate updated SDK Terms and Conditions document 
Automated import of CL 146340
 2009-04-15 11:28:57 -07:00
Leon Scroggins
63dda1c7b4 Make webkit's cursor draw at the correct times. 
This change is dependent on another change to external/webkit.  Tell the WebViewCore to change its FocusController's "active" status depending upon whether the WebView has focus.  This fixes a bug where we were showing the blinking cursor when the WebView was not in focus.
 2009-04-15 13:25:00 -04:00
Android (Google) Code Review
f5bfda1fce Merge change 190 into donut 
* changes:
  location: Move geocoding support from ILocationProvider to a new interface.
 2009-04-15 08:21:40 -07:00
Mike Lockwood
a55c321329 location: Move geocoding support from ILocationProvider to a new interface. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-15 11:17:37 -04:00
Eric Shienbrood
bdacd87562 Merge branch 'readonly-p4-master' 2009-04-15 06:59:53 -07:00
Eric Shienbrood
674dfebd81 AI 146316: Get build working by fixing manual merge that I messed up. 
Automated import of CL 146316
 2009-04-15 06:58:36 -07:00
Android (Google) Code Review
a2180c6eee Merge change 174 into donut 
* changes:
  Improve glgen
 2009-04-15 06:14:11 -07:00
Tammo Spalink
e87e9506ba eliminate seemingly pointless conversion to and then from hex string 2009-04-15 18:50:38 +08:00
Android (Google) Code Review
967f7c169c Merge change 175 into donut 
* changes:
  telephony: Don't disable an APN type that is not enabled.
 2009-04-14 20:19:42 -07:00
Mike Lockwood
d90ff986b4 telephony: Don't disable an APN type that is not enabled. 
Fixes a bad interaction between MMS and SUPL that occurs when they are using
the same APN.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-14 22:35:07 -04:00
Jack Palevich
4e70a9e462 Improve glgen 
+ gen script is really a bash script rather than a sh script,
  so declare that to be true. (For example, it uses pushd,
  which is a part of bash, but not a part of sh. Not sure
  how this worked until now. Possibly gen was only run in
  environments where /bin/sh was really bash.

+ Check the results of the java compile of the code generator,
  and abort the script if the compile fails.

+ Turn on the bash shell option that guards against using
  uninitialized variables in the script.

+ Remove the generated class files.

Refactor JniCodeEmitter into two classes: a general-purpose
JniCodeEmitter and a specific Jsr239CodeEmitter. The hope is
to use JniCodeEmitter as a base for emitting static OpenGL ES
bindings.
 2009-04-14 19:00:09 -07:00
Scott Main
c12801e1ed Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:23:06 -07:00
Scott Main
135d233540 AI 146255: am: CL 146254 clarification for the minSdkVersion attribute; 
added more information to the <uses-sdk> reference,
  added a link to it from the <manifes> reference, and
  revised some misleading information in the android 1.1 version notes
  Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 146255
 2009-04-14 17:21:49 -07:00
Scott Main
0ebf34a27a AI 146254: clarification for the minSdkVersion attribute; 
added more information to the <uses-sdk> reference,
  added a link to it from the <manifes> reference, and
  revised some misleading information in the android 1.1 version notes
  BUG=1788684

Automated import of CL 146254
 2009-04-14 17:19:13 -07:00
Scott Main
fb9edfd165 Merge branch 'readonly-p4-donut' into donut 2009-04-14 17:02:10 -07:00
Scott Main
63c4120e33 AI 146251: am: CL 146242 fix the package namespace in the examples; 
delete the old hello-android file
  Original author: smain
  Merged from: //branches/cupcake/...

Automated import of CL 146251
 2009-04-14 17:00:51 -07:00
Guang Zhu
17b8ca48ab Merge branch 'readonly-p4-donut' into donut 2009-04-14 16:47:03 -07:00
Guang Zhu
e6f63b1a15 AI 146246: am: CL 146225 Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early. 
Original author: guangzhu
  Merged from: //branches/cupcake/...

Automated import of CL 146246
 2009-04-14 16:45:47 -07:00
Scott Main
a9fe9e21d3 AI 146242: fix the package namespace in the examples; 
delete the old hello-android file
  BUG=1750212

Automated import of CL 146242
 2009-04-14 16:29:14 -07:00
Guang Zhu
7fc3cd6aeb AI 146225: Work around initialization issue with InstrumentationTest Runner. super.onCreate needs to be called as last statement in subclass' onCreate to avoid starting test case too early. 
Automated import of CL 146225
 2009-04-14 15:49:35 -07:00
Eric Shienbrood
51b0c74d8d Merge branch 'readonly-p4-master' 2009-04-14 15:41:38 -07:00
Eric Shienbrood
2ecc74f330 AI 146222: Manual merge of 145980 from donutburger => master. 
Automated import of CL 146222
 2009-04-14 15:40:20 -07:00
Mathias Agopian
5f105d38e2 Merge commit 'goog/master' into merge_master 2009-04-14 15:21:33 -07:00
Mathias Agopian
032c85d636 Merge commit 'goog/master_gl' into merge_master 2009-04-14 14:56:34 -07:00
Mathias Agopian
85d7a06826 Merge commit 'goog/master' into merge_master 2009-04-14 14:45:37 -07:00
Android (Google) Code Review
e2393c5792 Merge changes 108,130,131 into donut 
* changes:
  util/DebugUtils: Remove references to android.util.Config
  text: Remove references to android.util.Config
  Remove references to android.util.Config
 2009-04-14 14:40:02 -07:00
Android (Google) Code Review
4602d022ba Merge change 109 into donut 
* changes:
  Remove references to android.util.Config
 2009-04-14 14:39:51 -07:00
Yu Shan Emily Lau
b3c5b03055 Merge branch 'readonly-p4-master' 2009-04-14 14:33:23 -07:00
Yu Shan Emily Lau
810ec50a1e AI 146179: am: CL 145971 am: CL 145757 Suppress the flaky tests 
Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146179
 2009-04-14 14:32:03 -07:00
Android (Google) Code Review
2240eb8bcd Merge change 129 into donut 
* changes:
  Clean up trivial Eclipse warnings and fix whitespace.
 2009-04-14 14:15:22 -07:00
Android (Google) Code Review
be2355988d Merge change 154 into donut 
* changes:
  gps: Add support for bringing up a GSM data connection on demand for SUPL.
 2009-04-14 13:36:33 -07:00
Mike Lockwood
58bda98766 gps: Add support for bringing up a GSM data connection on demand for SUPL. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-14 16:25:07 -04:00
Android (Google) Code Review
b0d4a3502e Merge change 133 into donut 
* changes:
  Initial code for cdma sms encode and decode, in java, with simple tests.
 2009-04-14 13:20:43 -07:00
Android (Google) Code Review
f2aad4a468 Merge change 132 into donut 
* changes:
  Let's do bug #1769910 actually right.
 2009-04-14 13:15:43 -07:00
Android (Google) Code Review
ab6f5c6e86 Merge change 142 into donut 
* changes:
  telephony: Add support for bringing up GSM data connections for GPS SUPL.
 2009-04-14 12:52:28 -07:00
Dan Bornstein
649435a40f Merge branch 'readonly-p4-master' 2009-04-14 12:42:22 -07:00
Dan Bornstein
5a0e535782 AI 146178: am: CL 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/...
  Original author: android-build

Automated import of CL 146178
 2009-04-14 12:41:05 -07:00
Brett Chabot
3071177a4a Merge branch 'readonly-p4-master' 2009-04-14 12:39:37 -07:00
Brett Chabot
23d1b4b21c AI 146177: am: CL 145969 am: CL 145735 Suppress the flaky DatabaseLockTest 
Original author: brettchabot
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146177
 2009-04-14 12:38:22 -07:00
Eric Fischer
574d89fa04 AI 146175: Import updated translations. 
Automated import of CL 146175
 2009-04-14 12:10:43 -07:00
Lorenzo Colitti
cb1ac4f88f Merge branch 'readonly-p4-master' 2009-04-14 12:10:26 -07:00
Lorenzo Colitti
d86e6ddfc1 AI 146166: am: CL 145920 Don't filter out IPv6 multicast packets. 
Original author: lorenzo

Automated import of CL 146166
 2009-04-14 12:08:54 -07:00
Leon Scroggins
96c27559b0 Merge commit 'goog/master' 2009-04-14 12:06:19 -07:00
Mike Lockwood
42ad56ead4 telephony: Add support for bringing up GSM data connections for GPS SUPL. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2009-04-14 14:58:29 -04:00