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

61600 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Danielle Millett
fb479474ba am 77c7b4dd: am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 
* commit '77c7b4ddebd20006be2d30b7906ac67efc4dc207':
  Showing a congratulations screen after choosing face unlock backup lock
 2011-11-09 19:37:21 +00:00
Danielle Millett
77c7b4ddeb am b9b08257: Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 
* commit 'b9b08257370d244b4bccc4e243dda3c4daf4b0af':
  Showing a congratulations screen after choosing face unlock backup lock
 2011-11-09 19:34:44 +00:00
Steve Block
6894fccdc0 am d9514738: Merge "Clean up JavaDoc for WebView.addJavascriptInterface()" 
* commit 'd9514738593ff2e96dcdeff98516c57bab09e9bf':
  Clean up JavaDoc for WebView.addJavascriptInterface()
 2011-11-09 17:45:24 +00:00
Steve Block
d951473859 Merge "Clean up JavaDoc for WebView.addJavascriptInterface()" 2011-11-09 09:43:53 -08:00
Robert Greenwalt
81acae1465 am 0669a77f: Merge "resolved conflicts for merge of ea54b760 to master" 
* commit '0669a77fe9490b4a8e853a525633d5287ccbee8c':
  Wimax : wimax framework related open source.
 2011-11-09 17:12:25 +00:00
Robert Greenwalt
0669a77fe9 Merge "resolved conflicts for merge of ea54b760 to master" 2011-11-09 09:10:42 -08:00
Steve Block
4cd73c5bfd Clean up JavaDoc for WebView.addJavascriptInterface() 
Bug: 5461416
Change-Id: Ic83e0e4035f6230134e4f36938e53f106c468876
 2011-11-09 17:04:49 +00:00
Robert Greenwalt
c1b3cbe164 resolved conflicts for merge of ea54b760 to master 
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
 2011-11-09 09:03:59 -08:00
Steve Block
e46d500ec7 am 2f914432: Merge "Add another test for WebView\'s Java Bridge" 
* commit '2f914432690b0e5965c645e818ed24986e7d674f':
  Add another test for WebView's Java Bridge
 2011-11-09 16:51:23 +00:00
Steve Block
2f91443269 Merge "Add another test for WebView's Java Bridge" 2011-11-09 08:49:37 -08:00
Steve Block
8e33fe944f Add another test for WebView's Java Bridge 
Tests that an exception is raised if the wrong number of arguments are passed
to a method of an injected object.

Bug: 5140673
Change-Id: Ic9f9d09969e0fccbe82584e1a9ca7580f6010c87
 2011-11-09 16:22:13 +00:00
Tom Taylor
0ee2e72336 am 81b10fd7: am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 
* commit '81b10fd74ecad65eb9c658cf3881c9c0254351e9':
  Add new secure setting for controlling Messaging notifications
 2011-11-09 14:37:24 +00:00
Kristian Monsen
b25ff1ffee am b69ce803: Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 
* commit 'b69ce803837f6cb369c974e028cec1166f213aee':
  Part of fix for bug 5584571 Add HTTP request header with app name
 2011-11-09 14:37:18 +00:00
David 'Digit' Turner
e5e52e62bd am 423208d6: Merge "NDK: ANativeActivity: Fix documentation for \'clazz\' member." 
* commit '423208d6889ed86dc7e6790de873df6ecb07c98e':
  NDK: ANativeActivity: Fix documentation for 'clazz' member.
 2011-11-09 14:37:15 +00:00
Flavio Lerda
13efa0458d am 228a1af2: Merge "Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid." 
* commit '228a1af2131985bcacade7b75c2b2458b6ab677f':
  Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid.
 2011-11-09 14:37:13 +00:00
Jeff Brown
1a78f9f238 am 319369f3: Merge "Fix JavaDoc typos." 
* commit '319369f32f934118990e9d34039c5885cc5a37e0':
  Fix JavaDoc typos.
 2011-11-09 14:37:09 +00:00
Jeff Brown
4a2383b02c am 27720061: Merge "Delete dead code." 
* commit '27720061b068761914454e58001ffc9e352a5fa3':
  Delete dead code.
 2011-11-09 14:37:08 +00:00
Fabrice Di Meglio
5475f2f4d6 am 208d4592: Fix potential crash when shaping Hebrew with bold 
* commit '208d4592f6e8db90eab30cfca3dc294731258d1c':
  Fix potential crash when shaping Hebrew with bold
 2011-11-09 14:37:04 +00:00
Fabrice Di Meglio
04e9a7ecb4 am 4873dc8f: Merge "Fix bug #5559439 Bogus tab title in browser" 
* commit '4873dc8fbacb856e892f7ac6f0d6c88e5df21ecc':
  Fix bug #5559439 Bogus tab title in browser
 2011-11-09 14:36:55 +00:00
Fabrice Di Meglio
62595c7b03 am 5af44736: Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 
* commit '5af447366d6dc5794cdcdd064bae72b66b9bc5c0':
  Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)
 2011-11-09 14:36:53 +00:00
Andreas Huber
175a7505a6 am ea427b0c: resolved conflicts for merge of 26f70db9 to master 
* commit 'ea427b0c87a52d5e770f50856401a81ff2658cc4':
  Remove surface legacy APIs and code.
 2011-11-09 14:36:37 +00:00
Tom Taylor
81b10fd74e am 1366c756: Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 
* commit '1366c756d28cdbb6c7c07959dfb4c93c81a9539d':
  Add new secure setting for controlling Messaging notifications
 2011-11-09 14:34:18 +00:00
Kristian Monsen
b69ce80383 Merge "Part of fix for bug 5584571 Add HTTP request header with app name" 2011-11-09 03:35:01 -08:00
Kristian Monsen
008c37d8f4 Part of fix for bug 5584571 Add HTTP request header with app name 
Need the context to get the package name, adding it method here
that can be called from JNI.

Change-Id: I530d81d9d922ea73a3f9d185618a5c4cfde0aca7
 2011-11-09 11:23:35 +00:00
David 'Digit' Turner
423208d688 Merge "NDK: ANativeActivity: Fix documentation for 'clazz' member." 2011-11-09 02:18:02 -08:00
Flavio Lerda
228a1af213 Merge "Adding two tests to ensure formatNumber is working correctly with Polish numbers, both valid and invalid." 2011-11-09 02:13:41 -08:00
Jeff Brown
319369f32f Merge "Fix JavaDoc typos." 2011-11-08 20:41:09 -08:00
Jeff Brown
27720061b0 Merge "Delete dead code." 2011-11-08 20:40:55 -08:00
Jeff Brown
603f97f324 Fix JavaDoc typos. 
Change-Id: Ieabcd5b89c89440f425917319225735445324765
 2011-11-08 20:24:21 -08:00
Jeff Brown
a965f083d0 Delete dead code. 
Change-Id: Ia78e338a363ab82f9c0b45ce324c2a7cfa8d8246
 2011-11-08 20:24:21 -08:00
Fabrice Di Meglio
208d4592f6 Fix potential crash when shaping Hebrew with bold 
- make code more resilient
- make correct initialization of gHebrewRegularTypeface

Change-Id: I97e98d36b830ad35979184c1459e8c8503eb3d28
 2011-11-08 17:13:49 -08:00
Fabrice Di Meglio
4873dc8fba Merge "Fix bug #5559439 Bogus tab title in browser" 2011-11-08 15:57:40 -08:00
Fabrice Di Meglio
5af447366d Merge "Fix bug #5387832 [UI/Visual] Address of the website is not displayed properly(second line of the address is partly shown)" 2011-11-08 15:55:41 -08:00
Andreas Huber
ea427b0c87 resolved conflicts for merge of 26f70db9 to master 
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
 2011-11-08 10:40:20 -08:00
Danielle Millett
b9b0825737 Merge "Showing a congratulations screen after choosing face unlock backup lock" into ics-mr1 2011-11-08 10:03:24 -08:00
Robert Greenwalt
ea54b76085 Merge "Wimax : wimax framework related open source." into ics-mr1 2011-11-08 10:01:07 -08:00
Tom Taylor
1366c756d2 Merge "Add new secure setting for controlling Messaging notifications" into ics-mr1 2011-11-08 09:00:22 -08:00
Andreas Huber
26f70db99f Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
John Reck
5d03444c3e am e43a7c18: am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1 
* commit 'e43a7c18ecf3de8df774362a9bc3e97d8469ac00':
  Remove unnecessary memory allocations
 2011-11-08 16:43:48 +00:00
John Reck
e43a7c18ec am 99015a24: Merge "Remove unnecessary memory allocations" into ics-mr1 
* commit '99015a2464a40097c3e23e07cdf69da0f886aa66':
  Remove unnecessary memory allocations
 2011-11-08 16:41:32 +00:00
Eric Laurent
6b760bc087 am 2cb57608: am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1 
* commit '2cb57608965fd856b4b79b3f950d6c628e66aed5':
  AudioFlinger: mix track only when really ready
 2011-11-08 16:39:19 +00:00
John Reck
99015a2464 Merge "Remove unnecessary memory allocations" into ics-mr1 2011-11-08 08:38:07 -08:00
Eric Laurent
2cb5760896 am f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1 
* commit 'f3a892ab9347ce733b81ccb4913a91c586f8f367':
  AudioFlinger: mix track only when really ready
 2011-11-08 16:37:11 +00:00
Eric Laurent
f3a892ab93 Merge "AudioFlinger: mix track only when really ready" into ics-mr1 2011-11-08 08:32:57 -08:00
Ed Heyl
e33f0944ab am ba1f05d4: am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
* commit 'ba1f05d4a816dd60a6be2a09858d8c9ecf3d552d':
  Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
 2011-11-08 14:06:52 +00:00
Ed Heyl
ba1f05d4a8 am 9d6a5162: Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
* commit '9d6a51623fdabbe993d7b8848794607394ef7cc2':
  Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp"
 2011-11-08 14:04:18 +00:00
Ed Heyl
9d6a51623f Fix build break; Revert "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" 
This reverts commit ae5839dcad76625313e6736d69eeaf37af435a3f.
 2011-11-08 05:58:37 -08:00
David 'Digit' Turner
dd00e734f3 NDK: ANativeActivity: Fix documentation for 'clazz' member. 
As discussed on the android-ndk forum, it turns out that the
member named 'clazz' is really a global reference to the NativeActivity
instance. As such, it's really a handle to a VM object, not a VM class.

Ideally, we would rename it to 'activity', but this cannot be done
without breaking NDK source compatibility.

Change-Id: I82ca1549b35346a3eacf9e84c4c836387fc883a6
 2011-11-08 14:18:11 +01:00
Narayan Kamath
0f00f570d3 am f537b25a: am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1 
* commit 'f537b25a98449e6541987152874a2b552e7aa104':
  Fix a bug in the network TTS api.
 2011-11-08 10:15:38 +00:00
Narayan Kamath
f537b25a98 am 98f5500c: Merge "Fix a bug in the network TTS api." into ics-mr1 
* commit '98f5500c71754dad428e00d569007e0b98dc8aee':
  Fix a bug in the network TTS api.
 2011-11-08 10:13:39 +00:00