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

8178 Commits

Author SHA1 Message Date
Ken Shirriff
8fdd45e1aa Merge "Add SyncState class for calendar provider." 2010-01-25 10:50:47 -08:00
Grace Kloba
96949efc54 We were blocking updating display tree during drag. 
Now we only lower the WebViewCore thread priority.
So rename the functions to reflect the new meaning.
 2010-01-25 09:53:01 -08:00
Grace Kloba
733687d47a Merge "Manual merge pinch zoom from Eclair to Master." 2010-01-25 09:31:20 -08:00
Mike Reed
b22446901c am f904be16: Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 
Merge commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737' into eclair-plus-aosp

* commit 'f904be1659fcc88dd80be2c900ffc89e77b1c737':
  disable high-quality filtering during scrolling, until I can cached the scaled images.
 2010-01-25 06:24:35 -08:00
Mike Reed
f904be1659 Merge "disable high-quality filtering during scrolling, until I can cached the scaled images." into eclair 2010-01-25 06:19:17 -08:00
Mike Reed
729d8369b5 disable high-quality filtering during scrolling, until I can cached the scaled images. 2010-01-25 08:30:35 -05: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
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
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
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
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
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
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
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
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
Grace Kloba
5ff24d5da4 DO NOT MERGE 
This reverts commit 52cb3cbd6fe06e3706be1a7c2939f027106aaaf7.
 2010-01-22 12:45:54 -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
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
Andy McFadden
a93e459149 Merge "Move VM feature strings (used by DDMS) into VM." 2010-01-22 11:32:52 -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
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
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
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
Grace Kloba
77dc179baa As embedded and full screen shares the same view, 
we have to replace the AbsoluteLayout with
ViewGroup.Layout before setting it to the dialog
as dialog's FrameLayout doesn't accept AbsoluteLayout.

This should fix the crash when changing orientation.
 2010-01-21 19:13:34 -08:00
Romain Guy
177b580f56 Merge "Add a new attribute to LinearLayout: useLargestChild. Bug #2379138" 2010-01-21 19:11:20 -08:00
Romain Guy
5b1b241710 Add a new attribute to LinearLayout: useLargestChild. 
Bug #2379138

This new attribute is to be used when the LinearLayout is wrap_content but you want
all the children inside to have the same dimension. Set useLargestChild to true and
give all the children a width/height of 0 and a weight of 1.0.
 2010-01-21 19:09:51 -08:00
Grace Kloba
01752fe46b am 8d4baa78: am d79d1c72: Merge "If ZoomButttonsController detects more than one pointer, give up the control. This should enable the View behind it, like WebView, will always get the multi-pointer events even when ZoomButtonsController is up." into eclair 
Merge commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2'

* commit '8d4baa789302b2c0f2657af9ba6dc98fcc926ee2':
  If ZoomButttonsController detects more than one pointer,
 2010-01-21 17:56:46 -08:00
Jim Miller
cd2354f540 am 84928fa9: am 813d2d86: Merge "Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent." into eclair 
Merge commit '84928fa93c3be222b77794de9922d299f4971ea4'

* commit '84928fa93c3be222b77794de9922d299f4971ea4':
  Fix for 2292713: Remove workaround that hides SlidingTab widget while internal state is inconsistent.
 2010-01-21 17:56:03 -08:00
Fred Quintana
6f3e1e27a6 am 9a400fa4: Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 
Merge commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1' into eclair-plus-aosp

* commit '9a400fa4d3e89a3ab3669c0aa2ef6676020646d1':
  initialize sync adapters that get installed while the system is running
 2010-01-21 17:35:28 -08:00
Fred Quintana
9a400fa4d3 Merge "initialize sync adapters that get installed while the system is running bug http://b/issue?id=2360782" into eclair 2010-01-21 17:30:07 -08:00
Paul Westbrook
fa5875a3c5 Merge "Bug 2330111" 2010-01-21 17:14:06 -08:00
Paul Westbrook
68f2f547f5 Bug 2330111 
Make NumberPicker public

Made setCurrent() more robust, as the value needs to be within the range
specified earlier. setCurrent() will now throw an exception
if the specified doesn't fall in the range
 2010-01-21 16:56:57 -08:00
Wink Saville
aa6a2aad03 Fix build, incorrect link/see tags. 
Change-Id: Ia1c13ddb198721234323f1944ea3537ea6f34820
 2010-01-21 16:37:04 -08:00
Kenny Root
3a19833750 Multiple asset adding in one shot for AssetManager 
Add a hidden convenience method to allow adding multiple assets
to an AssetManager at once.

Change-Id: I56753a85904a2c8e9a405cba2ea3cb85ec40e1cc
 2010-01-21 16:09:40 -08:00
Eric Fischer
ad0e536355 am 50adb167: Pull in "emergency calls only" translations. 
Merge commit '50adb167534889421dc0d7cfc7d3bf663c03f01c' into eclair-plus-aosp

* commit '50adb167534889421dc0d7cfc7d3bf663c03f01c':
  Pull in "emergency calls only" translations.
 2010-01-21 15:14:30 -08:00
Jim Miller
11b019d07f Fix 2385283: Use device-specific salt when generating hashes for lock passwords. 2010-01-21 14:53:22 -08:00
Dianne Hackborn
df83afaf29 More device policy manager / admin work. 
Update API with some new features, re-arrange how you check for valid
passwords, and start hooking up the back-end implementation.
 2010-01-21 14:30:57 -08:00
John Wang
97fdd0aba9 am 7f70998d: Merge "Add Emergency Calls Only String." into eclair 
Merge commit '7f70998dec6d7db850373b7e75677ecf72904878' into eclair-plus-aosp

* commit '7f70998dec6d7db850373b7e75677ecf72904878':
  Add Emergency Calls Only String.
 2010-01-21 14:06:35 -08:00