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

17449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Doug Zongker
b35df8f6c7 Merge "remove GoogleLoginService unit test" 2010-01-22 14:30:02 -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
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
San Mehat
ed4fc8acc5 NetworkManagementService: Introduce API methods for configuring interfaces 
Signed-off-by: San Mehat <san@google.com>
 2010-01-22 12:28:36 -08:00
Ken Shirriff
ead4f9cef5 Add SyncState class for calendar provider. 
This parallels the SyncState on ContactsContract.
 2010-01-22 12:26:50 -08:00
San Mehat
353ced79b4 android.net: Introduce @hidden parcelable InterfaceConfiguration class 
This class is used to get/set interface configuration via the
new NetworkManagementService API

Signed-off-by: San Mehat <san@google.com>
 2010-01-22 12:22:54 -08:00
Scott Main
4789f0cd16 am 382f924c: am 5615ca19: docs: a lot of revision and expansion of the hello view tutorials includes new screenshots for some tutorials and a new sample images zip file 
Merge commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4'

* commit '382f924c951ff49e9bbb48a744a45fce1ad7ccd4':
  docs: a lot of revision and expansion of the hello view tutorials
 2010-01-22 12:00:42 -08:00
Adam Powell
a948f4787b am 97b10853: am 5910cb53: Merge "Edge of screen slop detection for ScaleGestureDetector." into eclair 
Merge commit '97b108532f04f72af035e372be7b827f77888650'

* commit '97b108532f04f72af035e372be7b827f77888650':
  Edge of screen slop detection for ScaleGestureDetector.
 2010-01-22 12:00:24 -08:00
Scott Main
95127b8e44 am 5ed68156: am de54a95b: Merge "docs: add a section about debugging web pages with the Console APIs; revise and cleanup some of the other content." into eclair 
Merge commit '5ed681561c5904eb55a275387f1df8cec401361c'

* commit '5ed681561c5904eb55a275387f1df8cec401361c':
  docs: add a section about debugging web pages with the Console APIs;
 2010-01-22 12:00:00 -08:00
Dianne Hackborn
c0cea48576 am 5f641285: am b1c4a2a3: Fix issue #2364506: Phone locked up while listening to music and attempting to download an update 
Merge commit '5f64128568d815f91dcd37db43d4e26a0566b41c'

* commit '5f64128568d815f91dcd37db43d4e26a0566b41c':
  Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
 2010-01-22 11:59:41 -08:00
Mathias Agopian
f226e9f27b Merge "return an error when Surface::lock() is called while the surface is already locked." 2010-01-22 11:52:08 -08:00
Mathias Agopian
116e541eac return an error when Surface::lock() is called while the surface is already locked. 2010-01-22 11:47:55 -08:00
Andy McFadden
a93e459149 Merge "Move VM feature strings (used by DDMS) into VM." 2010-01-22 11:32:52 -08:00
Ken Shirriff
e27ef0166a Merge "Remove unused providers" 2010-01-22 11:14:43 -08:00
Romain Guy
2e61d7ca64 Merge "Bring back buttons in dialogs. Bug #2390537" 2010-01-22 11:01:42 -08:00
Romain Guy
cf635ae7c6 Bring back buttons in dialogs. 
Bug #2390537
 2010-01-22 11:00:29 -08:00
Xavier Ducrohet
28d9c60ee2 am 60e3c09e: am 6866daee: Merge "ADT/Layoutlib: implement radial gradient." into eclair 
Merge commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7'

* commit '60e3c09ec0fa73a3e650f4aec89c763599c2e0b7':
  ADT/Layoutlib: implement radial gradient.
 2010-01-22 09:45:49 -08:00
Ying Wang
b70efcbbb1 am 3c05f1fb: am b5fb50a1: Merge "Add instrumentation as a source tag for proguard keep options." into eclair 
Merge commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c'

* commit '3c05f1fbac2ce35483f61dbd5d5bfb6341da6d9c':
  Add instrumentation as a source tag for proguard keep options.
 2010-01-22 09:45:31 -08:00
Guang Zhu
6d001c0f7a am e0aed796: am ccec75e7: Merge "Prevent orientation change from triggering activity recreation." into eclair 
Merge commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0'

* commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0':
  Prevent orientation change from triggering activity recreation.
 2010-01-22 09:44:34 -08:00
Amith Yamasani
bd6f964da1 am 658dc0d4: am b35b8c13: Merge "Security fix in accessibility - don\'t read out password. # 2371557" into eclair 
Merge commit '658dc0d4b03015eb4a692968b82b664e24aa605a'

* commit '658dc0d4b03015eb4a692968b82b664e24aa605a':
  Security fix in accessibility - don't read out password. # 2371557
 2010-01-22 09:44:16 -08:00
Scott Main
dae34fa8a1 am d603e989: am 88e653f6: Merge "docs: some spelling typos" into eclair 
Merge commit 'd603e989f47093ad9f7638bd3f62717daa731fd5'

* commit 'd603e989f47093ad9f7638bd3f62717daa731fd5':
  docs: some spelling typos
 2010-01-22 09:43:56 -08:00
Andy McFadden
e577232406 Move VM feature strings (used by DDMS) into VM. 
Until now, we used a place-holder in frameworks/base.

Disable a test that shouldn't have been on.
 2010-01-22 09:36:03 -08:00
Marco Nelissen
7c45147f35 Merge "Make the media scanner disregard database entries that do not have absolute path names. This allows us to store other things (perhaps with http or content URIs) in the database, without the media scanner removing them again." 2010-01-22 07:53:12 -08:00
Ken Shirriff
e79f721e71 Remove unused providers 
bug 2388178
 2010-01-22 00:14:50 -08:00
Ken Shirriff
a69a23b2a5 Use AUTHORITY constant for calendar. 
This will allow the calendar authority to be changed later.

bug 2388178
 2010-01-21 21:46:31 -08:00
Chih-Chung Chang
e1ceec234c Add an orientation parameter for overlay, so we can do camera preview in portrait mode. 2010-01-21 20:20:08 -08:00