286 Commits

Author SHA1 Message Date
Feng Qian
3d4122c5a2 Merge branch 'readonly-p4-master' 2009-04-10 18:12:55 -07:00
Feng Qian
9ae010a349 AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
2009-04-10 18:11:32 -07:00
Ficus Kirkpatrick
ed740498ca Add method on EncodedStringValue to transform a String[]. 2009-04-10 15:50:01 -07:00
Fred Quintana
546f75c5c5 Merge branch 'readonly-p4-master' 2009-04-09 15:07:04 -07:00
Fred Quintana
26fc5eba50 AI 145535: reenable the signin notifications
the system process has permissions to control this
  notification but the caller doesn't do we need to call
  clearCallerIdentity() before manipulating the notification
  BUG=1778648

Automated import of CL 145535
2009-04-09 15:05:50 -07:00
Eric Fischer
af64013eca Merge branch 'readonly-p4-master' 2009-04-09 14:33:10 -07:00
Eric Fischer
580b13017e AI 145500: am: CL 145493 am: CL 145214 Update cupcake translations.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 145500
2009-04-09 14:31:52 -07:00
Romain Guy
12abafd643 Merge branch 'readonly-p4-master' 2009-04-08 19:21:21 -07:00
Romain Guy
5b13cb6486 AI 145189: am: CL 145188 Fixes #1580949. Compress text when marquee is enabled but the text is too big by only a few percent of the TextView's width.
Original author: romainguy

Automated import of CL 145189
2009-04-08 19:20:13 -07:00
Fred Quintana
0c9c41255e Merge branch 'readonly-p4-master' 2009-04-08 19:16:09 -07:00
Fred Quintana
a698f42769 AI 145177: phase two of the AccountManager
- added an AccountManagerActivity, a base Activity that can be
  used by activities that are launched by AccountAuthenticator
  intents. This makes it easy for an Activity to send a result
  using an AccountAuthenticatorResponse
  - added debug strings to the AccountAuthenticatorCache
  - improved the API for the AccountAuthenticatorResponse and
  made it Parcelable so that it can be passed to an Activity
  via an Intent
  - changed the AccountManager to use Futures for the
  asynchronous calls and to notify the user via a callback
  when the request is complete
  - changed the AccountManager to convert any errors that are
  returned into Exceptions
  - added constants for the error codes that are passed across
  the IAccountManagerResponse and
  IAccountAuthenticatorResponse interfaces
  - added a dump() method to the AccountManagerService so that
  it can display the list of active sessions and registered
  authenticators
  - added an way to interrogate the AccountManagerService for
  the list of registered authenticators
  - removed more methods from the GoogleLoginServiceHelper and
  GoogleLoginServiceBlockingHelper and changed the callers to
  use the AccountManager

Automated import of CL 145177
2009-04-08 19:14:54 -07:00
Cynthia Wong
5167f9e28b Merge branch 'readonly-p4-master' 2009-04-08 13:33:32 -07:00
Cynthia Wong
44e4aaf133 AI 145124: am: CL 144928 Make the uphill discarding ops functionality controllable via a Gservices flag
Original author: cynthiaw

Automated import of CL 145124
2009-04-08 13:32:09 -07:00
Andy McFadden
5bbf237689 Merge branch 'readonly-p4-master' 2009-04-08 00:37:08 -07:00
Andy McFadden
599c918d97 AI 144931: Added a (hidden) way to "pre-cache" register maps.
The 50 methods that appeared on the GC stacks of the most applications
  require 13KB of native heap for their uncompressed register maps, and
  the full set took 5ms to uncompress.  Pre-computation doesn't represent
  a significant improvement in space or time, at the cost of a big pile
  of strings in ZygoteInit.
  I'm leaving the method in ZygoteInit, but it's not called, and the
  static final String[] of method descriptors is empty.  We may want to
  revisit this later.
  BUG=1729570

Automated import of CL 144931
2009-04-08 00:35:56 -07:00
Eric Fischer
a44a28d358 Merge branch 'readonly-p4-master' 2009-04-08 00:31:50 -07:00
Eric Fischer
43f3693035 AI 144913: am: CL 144912 Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
  Import a bunch of revised translations.
  Original author: enf

Automated import of CL 144913
2009-04-08 00:30:38 -07:00
Wink Saville
ae0afc6d90 Merge branch 'readonly-p4-master' 2009-04-06 15:24:36 -07:00
Wink Saville
6ec9a7d55d AI 144706: am: CL 144705 Teleca patch from 03/27/2009, fixes some CDMA issues.
Original author: wink

Automated import of CL 144706
2009-04-06 15:23:24 -07:00
Grace Kloba
974bd7f298 Merge branch 'readonly-p4-master' 2009-04-06 10:48:36 -07:00
Grace Kloba
45dee41f5c AI 144661: Fix #175030. Preserve the zoom factor during refresh. Remove the code change in FrameLoader.cpp which was to preserve the zoom factor when we first did layout. Now we only use the initialZoomScale if it is a standard load. If it is history load, restoreScale() should be called before didFirstLayout(), in the other cases, like reload, refresh, replace, we don't change the zoom factor.
BUG=175030

Automated import of CL 144661
2009-04-06 10:47:26 -07:00
Romain Guy
e016b29d28 Merge branch 'readonly-p4-master' 2009-04-03 17:41:18 -07:00
Romain Guy
8e2f6a90b4 AI 144563: am: CL 144562 First pass at #1580949. Changes the marquee animation to make it less weird and jarring when the text overflows by a few pixels only. The next change will take care of compressing the text when the text is longer than the TextView by only a few % of its width.
Original author: romainguy

Automated import of CL 144563
2009-04-03 17:40:12 -07:00
Andy McFadden
8e58848436 Merge branch 'readonly-p4-master' 2009-04-03 11:10:54 -07:00
Andy McFadden
e2b23e11a5 AI 144469: Added test for dalvik.vm.check-dex-sum property.
Enables -Xcheckdexsum argument, which causes the VM to test checksums
  when loading optimized DEX files.
  BUG=1749836

Automated import of CL 144469
2009-04-03 11:09:46 -07:00
Mike Lockwood
508cbf2241 Merge branch 'readonly-p4-master' 2009-04-03 09:49:06 -07:00
Mike Lockwood
d9c0df1d3e AI 144460: am: CL 144459 Add "tty" to the status bar to fix the StatusBarService.
BUG=1761602
  Original author: lockwood

Automated import of CL 144460
2009-04-03 09:47:54 -07:00
Evan Millar
b6065536ef Merge branch 'readonly-p4-master' 2009-04-02 23:47:53 -07:00
Evan Millar
8fd3a039f8 AI 144417: am: CL 144379 Make checkin batteryinfo dump more terse
Original author: emillar

Automated import of CL 144417
2009-04-02 23:46:45 -07:00
Mike Lockwood
48554fc78e Merge branch 'readonly-p4-master' 2009-04-02 23:42:42 -07:00
Mike Lockwood
bd2a7126e5 AI 144415: am: CL 144372 Cleanup Settings support for enabling and disabling location providers:
LocationManagerService now listens for changes to settings,
  making LocationManager.updateProviders() unnecessary.
  Removed LocationManager.updateProviders()
  Added Settings.Secure.setLocationProviderEnabled(), which is a thread-safe way
  of enabling or disabling a single location provider.
  This is safer than reading, modifying and writing the LOCATION_PROVIDERS_ALLOWED directly.
  BUG=1729031
  Original author: lockwood

Automated import of CL 144415
2009-04-02 23:41:33 -07:00
Eric Fischer
c7a654f3fa Merge branch 'readonly-p4-master' 2009-04-02 23:40:06 -07:00
Eric Fischer
75e3034a35 AI 144414: am: CL 144347 Reimport es_US translations in an attempt to fix the build.
Original author: enf

Automated import of CL 144414
2009-04-02 23:38:59 -07:00
Eric Fischer
656ff983a9 Merge branch 'readonly-p4-master' 2009-04-02 23:32:28 -07:00
Eric Fischer
77db3fc025 AI 144411: am: CL 144336 am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144411
2009-04-02 23:31:17 -07:00
Evan Millar
f6afef350a Merge branch 'readonly-p4-master' 2009-04-02 23:29:53 -07:00
Evan Millar
0ba31ed95e AI 144410: am: CL 144333 Change the way the battery level tracking code works in BatteryStats. Before we simply kept track of the last
2 levels as recorded at plug and unplug events. During charge cycles this would be useful because it would tell us
  what the start and end levels were in the last discharge cycle. However during a discharge cycle this information could
  be misleading as it would give you the level at the last unplug event (beginning the the discharge cycle) and last plug
  event (end of the previous discharge cycle).
  Now we are still keeping track of 2 values, but they are "discharge cycle start level" and "discharge cycle current level".
  During a discharge cycle this will give you the level the current discharge cycle started at, and the current level. During
  a charge cycle the same data will be supplied as before (the start/end of the last discharge cycle).
  Original author: emillar

Automated import of CL 144410
2009-04-02 23:28:45 -07:00
Chris Tate
93e7e3b671 Merge branch 'readonly-p4-master' 2009-04-02 23:17:06 -07:00
Chris Tate
a34df8a2ba AI 144405: am: CL 144307 am: CL 144306 Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved.
Original author: ctate
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144405
2009-04-02 23:15:58 -07:00
Robert Greenwalt
494204d66b Merge branch 'readonly-p4-master' 2009-04-02 22:42:34 -07:00
Robert Greenwalt
28d139fa95 AI 144392: am: CL 144241 Stop polling dbus.
Original author: rgreenwalt

Automated import of CL 144392
2009-04-02 22:41:08 -07:00
Mike Lockwood
b77f2b51d7 Merge branch 'readonly-p4-master' 2009-04-02 22:34:31 -07:00
Mike Lockwood
460ae0c910 AI 144389: am: CL 144221 Fix typo in Javadoc
Original author: lockwood

Automated import of CL 144389
2009-04-02 22:33:27 -07:00
The Android Open Source Project
d3af727927 Merge branch 'readonly-p4-master'
Conflicts:

	telephony/java/com/android/internal/telephony/gsm/RIL.java
  resolved by removing gsm/RIL.java
2009-04-02 12:18:20 -07:00
Wink Saville
04e71b3db8 AI 144245: Fix merge conflict for megering in the CDMA changes in to master from donutburger.
Automated import of CL 144245
2009-04-02 11:00:54 -07:00
Grace Kloba
029a8c38c6 Merge branch 'readonly-p4-master' 2009-04-02 10:56:49 -07:00
Grace Kloba
3afdd56470 AI 144242: Fix 1750062. When createCacheFile, if we get 303, or redirect with cookies, or "no-store", make sure to remove the existing entry in the cache db before returning null for CachedResult.
BUG=1750062

Automated import of CL 144242
2009-04-02 10:55:37 -07:00
Leon Scroggins
c9222aa0f2 Merge branch 'readonly-p4-master' 2009-04-02 10:49:03 -07:00
Leon Scroggins
238ddbb8a2 AI 144235: Fix for 1752906: clicking "cancel" on a multiple <select> element disables future select elements from working. Add a listener for cancel, which will clear out the old popup, and allow a new one to be brought up in the future.
BUG=1752906

Automated import of CL 144235
2009-04-02 10:47:53 -07:00
Daisuke Miyakawa
506e0078b2 Merge branch 'readonly-p4-master' 2009-04-02 10:45:40 -07:00