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

17656 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wu-cheng Li
111d0367d7 Merge "Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency." 2010-01-24 23:24:10 -08:00
Wu-cheng Li
acf77033bb Change key to KEY_SUPPORTED_JPEG_THUMBNAIL_SIZES for consistency. 
bug:2375986
 2010-01-25 15:20:23 +08:00
Grace Kloba
3a0def280f Manual merge pinch zoom from Eclair to Master. 
Too many conflicts which prevent me to use git cherry-pick.
Merge based on the source diff.

WebSettings.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commitdiff;h=5f01d7e268167c5cfb3366ce08e20a66d9b6fa6f

WebView.java (excl. drag tracker changes)
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebView.java;h=ab1841e140d72c22885512722cf1b75925bb8747;hp=ed1a98ae2d9321a483f6f8fa97b29b78121e94a7;hb=eclair;hpb=db08d5cd441424e4f9621aae7c2414934f781400

WebViewCore.java
https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=blobdiff;f=core/java/android/webkit/WebViewCore.java;h=8ac915c556e3461f3c572c3a68d191ca1fecfee7;hp=a5a48527a389609e40da14ecad8c12dd8377cfaf;hb=eclair;hpb=dafc19a1406bdd554fb4629d79c8aa4d75aca363
 2010-01-23 21:11:54 -08:00
Romain Guy
ff65c8c559 Make vertical LinearLayouts behave like horizontal LLs do. 
A bug fix in the horizontal handling of "useLargestChild" was not fixed in the vertical code.
 2010-01-23 10:21:12 -08:00
San Mehat
45f6104082 MountService: Add support for renaming secure containers 
Signed-off-by: San Mehat <san@google.com>
 2010-01-23 08:12:43 -08:00
Bai Tao
4256586663 Modify the interface of HanziToPinyin class to make it generic and add test class 2010-01-23 12:57:21 +08:00
Jim Miller
33ca1f3218 am 2e4e25f3: Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair 
Merge commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc' into eclair-plus-aosp

* commit '2e4e25f39ea6488ddc2b5427ec4a66edc1f8facc':
  Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long.
 2010-01-22 20:23:37 -08:00
Jim Miller
2e4e25f39e Merge "Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long." into eclair 2010-01-22 20:19:12 -08:00
Jim Miller
af1b980ef1 Fix 2287263: Change carrier TextView to be 1 line and marquee if text is too long. 
This is intended as a workaround for the long text lines introduced in https://android-git.corp.google.com/g/#change,38100.
 2010-01-22 19:09:50 -08:00
Chih-Chung Chang
60e8495c16 Merge "Add support for 180/270 degrees rotation." 2010-01-22 18:08:23 -08:00
Kenny Root
5ecf8dd55d Merge "Add extra resources field for ApplicationInfo" 2010-01-22 17:14:49 -08:00
Kenny Root
d1ab01682b Add extra resources field for ApplicationInfo 
Allow ApplicationInfo to track multiple files it wants to use as
resources by adding a string array to its public definition.

Change-Id: Ieffc4b1755270520b59c4e5a3c084e86aef02346
 2010-01-22 17:05:50 -08:00
Robert Greenwalt
950b2391e2 am d2c21c15: am 8c166512: Merge "Cleanup of process-specific DNS." into eclair 
Merge commit 'd2c21c1518631edd798367cf20cbc5434321d266'

* commit 'd2c21c1518631edd798367cf20cbc5434321d266':
  Cleanup of process-specific DNS.
 2010-01-22 17:05:05 -08:00
Mike Lockwood
345bf168db am 47d302a0: am bb79e5fd: Merge "Be tolerant of GPS session and engine on status messages arriving out of order." into eclair 
Merge commit '47d302a001c71f90bee8dc31d868b463a47f2d51'

* commit '47d302a001c71f90bee8dc31d868b463a47f2d51':
  Be tolerant of GPS session and engine on status messages arriving out of order.
 2010-01-22 17:04:47 -08:00
Kenny Root
92da0b4453 Merge "Unhide resource-related API calls in Context" 2010-01-22 16:57:57 -08:00
Kenny Root
3214839482 Unhide resource-related API calls in Context 
Context hides methods related to the underlying functioning of
resources which are readily available from the ApplicationInfo
object.  This change allows getting access to information
without having to make PackageManager calls for it.

Change-Id: Icf6a9da652dad8175bd11b5cd81a924181070373
 2010-01-22 16:56:26 -08:00
Dirk Dougherty
99988b6ee6 am 84207956: Merge "SDK doc change: Misc small fixes." into eclair 
Merge commit '8420795633443221627eb872aea8f2862a38f8b1' into eclair-plus-aosp

* commit '8420795633443221627eb872aea8f2862a38f8b1':
  SDK doc change: Misc small fixes.
 2010-01-22 16:50:03 -08:00
Dirk Dougherty
43d5a09f46 am c5de95bf: Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 
Merge commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a' into eclair-plus-aosp

* commit 'c5de95bf25fda1a5e7f36f1229b0dd8d19c67f5a':
  SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager.
 2010-01-22 16:49:57 -08:00
San Mehat
3e3a6430ea Fix whitespace issue causing protocol syntax error 
Signed-off-by: San Mehat <san@google.com>
 2010-01-22 16:46:23 -08:00
Dirk Dougherty
8420795633 Merge "SDK doc change: Misc small fixes." into eclair 2010-01-22 16:45:58 -08:00
Christopher Tate
1902492420 Make sure to downgrade to app permissions when invoking callbacks 
The [private] binder interface is called from the system process, so make sure
we downgrade to the app's proper identity & permissions before allowing
execution to continue into app code.
 2010-01-22 16:39:53 -08:00
Dirk Dougherty
c5de95bf25 Merge "SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager." into eclair 2010-01-22 16:38:59 -08:00
Chih-Chung Chang
ac127dc31b Add support for 180/270 degrees rotation. 2010-01-22 16:30:39 -08:00
San Mehat
4d02d001ef NetworkManagementService: Introduce INetworkManagementEventObserver 
Introduce a callback event observer which can be registered on the
INetworkManagementService instance to receive events from the service.

Signed-off-by: San Mehat <san@google.com>
 2010-01-22 16:10:29 -08:00
Kenny Root
55434a7999 Merge "Multiple asset adding in one shot for AssetManager" 2010-01-22 15:54:11 -08:00
Dianne Hackborn
b0903104fd am 678e66a4: Merge "Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed" into eclair 
Merge commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2' into eclair-plus-aosp

* commit '678e66a4ec8bdceafd12f7d82c7d4aa8acf71aa2':
  Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed
 2010-01-22 15:51:02 -08:00
Dianne Hackborn
678e66a4ec Merge "Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed" into eclair 2010-01-22 15:47:08 -08:00
Romain Guy
7baf952c73 Merge "Make dialogs look better when their content is small." 2010-01-22 15:33:07 -08:00
Dan Egnor
85fd374eab Merge "As requested, expand ANR event log entry (and crash/WTF too) to include process flags (including FLAG_SYSTEM, etc)." 2010-01-22 15:24:17 -08:00
San Mehat
63454ebcc9 Merge "NetworkManagementService: Introduce API methods for configuring interfaces" 2010-01-22 15:20:18 -08:00
San Mehat
bf81cacc96 Merge "android.net: Introduce @hidden parcelable InterfaceConfiguration class" 2010-01-22 15:20:10 -08:00
Romain Guy
5e5e6ccc37 Make dialogs look better when their content is small. 2010-01-22 15:11:12 -08:00
Dirk Dougherty
5bc32d3539 SDK doc change: Misc small fixes. 
Bug:2160782
Change-Id: Ia0317fd6ea0c4b267d4304626d6cb8a889de65fd
 2010-01-22 15:11:00 -08:00
Andreas Huber
ddce5766a3 Merge "Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash." 2010-01-22 14:51:28 -08:00
Dan Egnor
2780e73ae7 As requested, expand ANR event log entry (and crash/WTF too) to include 
process flags (including FLAG_SYSTEM, etc).
 2010-01-22 14:47:35 -08:00
Dianne Hackborn
e6620b2d99 Fix issue #2391429: Crash during boot if fwd locked app is incompletely installed 
We need to remove left-over .apk when cleaning up a partially installed app.

Change-Id: I94264549670a2ad01622f746c40c82c30dd3da8d
 2010-01-22 14:46:21 -08:00
Andreas Huber
3522b5a579 Make sure to release the renderer before shutting down the hardware codec, qcom's hardware decoder will otherwise crash. 
related-to-bug: 2387981
 2010-01-22 14:36:53 -08:00
Dirk Dougherty
83d092573e SDK doc change: Add "fetch by http" workaround for connection problems in SDK Manager. 
Bug: 2160782
Change-Id: Iefa41d495182a89a5507ecfbf002c4948d44b448
 2010-01-22 14:31:47 -08:00
Doug Zongker
b35df8f6c7 Merge "remove GoogleLoginService unit test" 2010-01-22 14:30:02 -08:00
Dirk Dougherty
97ca28cdd9 am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 
Merge commit '5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp

* commit '5d14cb34c0e9760340c15ac5faf2d76a64797117':
  doc change: add announce for developer lab at mwc. move adc to carousel.
 2010-01-22 14:28:05 -08:00
Dirk Dougherty
5d14cb34c0 Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair 2010-01-22 14:23:39 -08:00
Doug Zongker
39b17a1566 remove GoogleLoginService unit test 
This now lives in the vendor/google directory alongside
GoogleLoginService itself.

Change-Id: Ic934fa563cdad965e5f95c2f6da407ea720bc0bf
 2010-01-22 14:23:14 -08:00
Nick Pelly
21bf222446 Fix leak of DBus match rule. 
We were registering a match for 'AudioSink', but unregistering 'audio.sink'.
This does not immediately cause an error, but stress testing of BT off/on found
that the leak causes a DBus Limits Error after ~300 iterations. It then becomes
impossible to turn BT on again until a reboot.
 2010-01-22 14:12:12 -08:00
Dirk Dougherty
a0fc438334 doc change: add announce for developer lab at mwc. move adc to carousel. 
Bug: 2160782
Change-Id: I657738d9452058a2078d81d65b5747b1676a3230
 2010-01-22 13:22:42 -08:00
John Wang
89fec7b155 am 098295a5: Merge "Updated emergency string when locale changes." into eclair 
Merge commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0' into eclair-plus-aosp

* commit '098295a5a3e840e94040ce38eb08eb6c72b2a7e0':
  Updated emergency string when locale changes.
 2010-01-22 13:20:25 -08:00
Grace Kloba
4f01c92750 am 5ff24d5d: DO NOT MERGE 
Merge commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d' into eclair-plus-aosp

* commit '5ff24d5da414db4e8c2ebe98f40976e7be62b72d':
  DO NOT MERGE
 2010-01-22 13:17:52 -08:00
John Wang
098295a5a3 Merge "Updated emergency string when locale changes." into eclair 2010-01-22 13:17:25 -08:00
John Wang
670db2c696 Updated emergency string when locale changes. 
For bug 2352094.
 2010-01-22 13:07:58 -08:00
Grace Kloba
5ff24d5da4 DO NOT MERGE 
This reverts commit 52cb3cbd6fe06e3706be1a7c2939f027106aaaf7.
 2010-01-22 12:45:54 -08:00
Xavier Ducrohet
264ce38258 am 3bd6dc65: am b44051ee: Merge "ADT/Layoutlib: implement sweep gradient." into eclair 
Merge commit '3bd6dc653521281db25df77f055b3ec0b4659454'

* commit '3bd6dc653521281db25df77f055b3ec0b4659454':
  ADT/Layoutlib: implement sweep gradient.
 2010-01-22 12:36:26 -08:00