8291 Commits

Author SHA1 Message Date
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
Eric Fischer
50adb16753 Pull in "emergency calls only" translations. 2010-01-21 13:52:09 -08:00
John Wang
7f70998dec Merge "Add Emergency Calls Only String." into eclair 2010-01-21 13:38:32 -08:00
Leon Scroggins
04ce08f34e Merge "Create a common method for updating the title of a download from the filename." 2010-01-21 13:29:32 -08:00
Leon Scroggins
fe79ef44fe Create a common method for updating the title of a download from the filename.
This method will be used by the DownloadProvider and the BrowserDownloadPage.
2010-01-21 16:19:41 -05:00
Fred Quintana
44037e6c41 initialize sync adapters that get installed while the system is running
bug http://b/issue?id=2360782
2010-01-21 13:14:49 -08:00
John Wang
f936745f5a Add Emergency Calls Only String.
Prepare strings for bug 2352094.

The string is the same as the settings.R.string.radioInfo_service_emergency,
so use the same msgid and translations.
2010-01-21 12:46:01 -08:00
Wei Huang
29bc7270ec am 495bae67: Merge "fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget." into eclair
Merge commit '495bae67ff7df4a11325a4cc1d8af288f82128fe' into eclair-plus-aosp

* commit '495bae67ff7df4a11325a4cc1d8af288f82128fe':
  fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
2010-01-21 12:28:08 -08:00
Wei Huang
22149f3d4e fix bug 2264186: clean up the outstanding async queries in ContactHeaderWidget.
- ContactHeaderWidget has cascading async queries, which weren't cancelled if a new query for a different phone number is started.
If the new query fails to find a corresponding contact, the old async queries from the previous number could end up setting the
contact name and photo to the wrong contact.

I tested this by calling

  ContactHeaderWidget.bindFromPhoneNumber(number1);
  ContactHeaderWidget.bindFromPhoneNumber(number2);

where number1 has a corresponding contact in the databse, and number2 doesn't. At the end of these 2 calls, the ContactHeaderWidget
would display the contact info for number1.

- also found a bug in AsyncQueryHandler.cancelOperation(), which doesn't reliably cancel the previous query. In ContactHeaderWidget's
case, we really depend on the cancelling to work. So work around this bug by resetting mAsyncQueryHandler when we need to do a
new lookup/query. When the old query result is passed back in the callback, discard the result if the QueryHandler is not the same
as mAsyncQueryHandler.

Change-Id: Ice79e77f787af03400e080cbd58162a91838181f
2010-01-21 12:06:43 -08:00
Justin Mattson
ef340357ce NEW_API: Declare an ACTION_SEARCH_SETTINGS constant in android.provider.Settings so that apps can cause this system setting group to be opened directly.
The Settings app already responds to this action it just was not exposed in the platform API.
2010-01-21 11:40:58 -08:00
Amith Yamasani
2fa6b52c2b Merge "Workaround for a database update callback that claims that the data doesn't exist." 2010-01-21 11:22:01 -08:00
The Android Open Source Project
176a88ff14 merge from open-source master 2010-01-21 11:21:25 -08:00
Vasu Nori
589eb9c5e1 Merge "caching PRAGMA sql statements caused cts-tests failures." 2010-01-21 10:29:22 -08:00
Amith Yamasani
58bb107f2a Workaround for a database update callback that claims that the data doesn't exist.
It's probably some intermediate state when updating the volumes that's causing
the row to be missing.
2010-01-21 09:58:01 -08:00
Derek Sollenberger
72666bac20 am 1f7747ad: am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '1f7747adb6a79317f4bd52fb78b3c567dd203883'

* commit '1f7747adb6a79317f4bd52fb78b3c567dd203883':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:39:15 -08:00
Derek Sollenberger
1f7747adb6 am 7cabb03d: Resize the WebView when the soft-keyboard appears in landscape mode.
Merge commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1' into eclair-mr2-plus-aosp

* commit '7cabb03da7053f3ceb5ff8b41b6a46052c6658a1':
  Resize the WebView when the soft-keyboard appears in landscape mode.
2010-01-21 08:29:33 -08:00
Mike Lockwood
80ffe5d2fe Merge "Implement Notification.DEFAULT_LIGHTS flag." 2010-01-21 08:18:15 -08:00
Derek Sollenberger
7cabb03da7 Resize the WebView when the soft-keyboard appears in landscape mode.
The WebView notifies the IME that it wishes to be resized when the
soft-keyboard is displayed. This fixes http://b/2170192.
2010-01-21 10:37:38 -05:00
Grace Kloba
e5b9beae26 am f6aed0e0: Merge "DO NOT MERGE" into eclair
Merge commit 'f6aed0e0a7c96094b66f5426baad78032b794497' into eclair-plus-aosp

* commit 'f6aed0e0a7c96094b66f5426baad78032b794497':
  DO NOT MERGE
2010-01-20 23:34:42 -08:00
Grace Kloba
f6aed0e0a7 Merge "DO NOT MERGE" into eclair 2010-01-20 23:30:05 -08:00
Grace Kloba
5b74576218 am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.
Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics
2010-01-20 23:26:03 -08:00
Grace Kloba
d5ada83c71 ScaleGestureDetector needs to query the displaymetrics
for the width/height on each touch down as orientation
can change.

This should fix the problem where we can't pinch on the
top right corner when device is in landscape mode.
2010-01-20 23:06:43 -08:00
Grace Kloba
52cb3cbd6f DO NOT MERGE
Just scale the canvas instead of changing the real
scale factor during pinch.

Added over limit zoom feedback for pinch in the WebView.

Fix http://b/issue?id=2383539
2010-01-20 21:58:27 -08:00
Mike Lockwood
670f93283b Implement Notification.DEFAULT_LIGHTS flag.
This flag was already in the public API but did not do anything until now.
We now use it so we can override the default notification LED color on a per device basis.

Change-Id: I0d6e239b7da2fdbeda9608d6d4de3e778aa88e2c
BUG: 2329568

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-01-20 22:43:47 -05:00
Grace Kloba
aeeb1a84aa am 8681df90: DO NOT MERGE
Merge commit '8681df902e8cc61d290808c5d78ea48920d30f3b' into eclair-plus-aosp

* commit '8681df902e8cc61d290808c5d78ea48920d30f3b':
  DO NOT MERGE
2010-01-20 19:20:57 -08:00
Grace Kloba
8681df902e DO NOT MERGE
Adopt the sloppy detection in the ScaleGestureDetector.
Try to fix the fat thumb problem.

Fix http://b/issue?id=2385061
2010-01-20 19:15:44 -08:00
Mike Reed
6dc9232c1c am a66baccc: Merge "Do not merge" into eclair
Merge commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb' into eclair-plus-aosp

* commit 'a66baccc8fa9f6fa5f1630845e3c6370cb3418eb':
  Do not merge
2010-01-20 18:35:24 -08:00
Mike Reed
a66baccc8f Merge "Do not merge" into eclair 2010-01-20 18:32:32 -08:00
San Mehat
db43099f9e Merge "INetworkManagementService: Add support for enumerating TTYs and attaching ppp servers to them" 2010-01-20 18:15:43 -08:00
Grace Kloba
f8c7d06ffa am 89e3c1ab: Merge "Fix the sloppy detection in the ScaleGestureDetector." into eclair
Merge commit '89e3c1ab017717b619b27ca312d87918981004ca' into eclair-plus-aosp

* commit '89e3c1ab017717b619b27ca312d87918981004ca':
  Fix the sloppy detection in the ScaleGestureDetector.
2010-01-20 17:40:30 -08:00
Grace Kloba
8f9fbb0c45 Fix the sloppy detection in the ScaleGestureDetector.
Fix http://b/issue?id=2385061
2010-01-20 17:35:50 -08:00
Vasu Nori
994bc22f1e caching PRAGMA sql statements caused cts-tests failures.
thats a strange-bug..caching PRAGMA sql statements caused sqlite to return
incorrect results.
2010-01-20 16:39:40 -08:00
Vasu Nori
1849d2d8c7 Merge "reduce logging noise from cache-full conditions." 2010-01-20 15:41:54 -08:00
San Mehat
72759df749 INetworkManagementService: Add support for enumerating TTYs and attaching ppp servers to them
Signed-off-by: San Mehat <san@google.com>

Updated: Refactor out duplicated code
2010-01-20 15:17:45 -08:00
Jim Miller
1206b9eb71 Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen." 2010-01-20 15:12:04 -08:00
Vasu Nori
e9d9210205 reduce logging noise from cache-full conditions.
when the compiled-sql cache is full, print the warning only a few times and
after that, if the condition persists, clear the cache.
don't flood the cache with the same warning million times.
2010-01-20 15:07:26 -08:00
Jim Miller
31f90b62e8 Fix 2385283: Add DevicePolicyManager calls to LockScreen. 2010-01-20 14:48:37 -08:00
Jacek Surazski
8be346429c Merge "Add systemApp field to ApplicationErrorReport" 2010-01-20 14:14:12 -08:00