Commit Graph

19760 Commits

Author SHA1 Message Date
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
Romain Guy
c23031933f AI 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.
BUG=1580949

Automated import of CL 144562
2009-04-03 17:37:18 -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
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
Evan Millar
e84de8d702 AI 144379: Make checkin batteryinfo dump more terse
BUG=1755458

Automated import of CL 144379
2009-04-02 22:16:12 -07:00
Mike Lockwood
9637d47489 AI 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

Automated import of CL 144372
2009-04-02 21:41:57 -07:00
Evan Millar
633a1740ce AI 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).
  B=144249

Automated import of CL 144333
2009-04-02 16:36:33 -07:00
Chris Tate
a919486d93 AI 144307: am: CL 144306 Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved.
Original author: ctate
  Merged from: //branches/cupcake/...

Automated import of CL 144307
2009-04-02 15:01:22 -07:00
Chris Tate
a48875a7d7 AI 144306: Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved.
BUG=1716562

Automated import of CL 144306
2009-04-02 14:59:14 -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
Daisuke Miyakawa
eb3e3e368a AI 144210: am: CL 144182 am: CL 144181 Modify ProgressDialog class and its xml so that it follows the
Android's UI guide line. This modification is based on leland's mock.
  See http://b/issue?id=1748136 for more information.
  Put ProgressNumber left side, next to ProgressPercentage.
  Make ProgressPercentage Bold.
  Put ProgressNumber and ProgressPercentage near to the ProgressBar
  above. This is same as the design of Market application.
  Enable ProgressDialog change the ProgressNumber format. This is hidden
  since the interface is premature.
  Original author: dmiyakawa
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144210
2009-04-02 10:44:31 -07:00
Chris Tate
ff9602a75b Merge branch 'readonly-p4-master' 2009-04-02 10:16:05 -07:00
Chris Tate
31c95fcd8f AI 144139: am: CL 144135 am: CL 144134 Fix issue 1750132 - SensorManager listener 'rate' parameter units are undocumented
Original author: ctate
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144139
2009-04-02 10:15:00 -07:00
Jack Palevich
8b5f56675b Merge branch 'readonly-p4-master' 2009-04-02 10:10:59 -07:00
Jack Palevich
84d8d693bd AI 144129: Remove hidden class android.os.Exec.
Change BugReportService to use java.os.ProcessBuilder instead.
  Remove unused import from DumpStateReceiver.
  An earlier change list created a private copy of this class for Term.
  BUG=1750582

Automated import of CL 144129
2009-04-02 10:09:47 -07:00
Robert Greenwalt
d30b2568cd AI 144241: Stop polling dbus.
BUG=1244263

Automated import of CL 144241
2009-04-02 09:53:35 -07:00
Doug Zongker
5c7e83fe06 Merge branch 'readonly-p4-master' 2009-04-02 09:25:56 -07:00
Doug Zongker
32a5a24b3f AI 144094: am: CL 144044 First cut of tunneling HTTP requests over gtalk connection:
- We define HttpRequest and HttpResponse protocol buffers.
  The RMQ mechanism is *not* used for these (though the
  messages define rmq id fields in case we want to start).
  - GTalkHttpClient will send an http request over the
  connection to MCS if:
  - gtalk_tunnel_http in gservices is turned on
  - the request destination is the android proxy
  - it can make a connection to gtalkservice
  The request falls back to using GoogleHttpClient if it can't
  be processed over the MCS connection.
  A few shortcuts are taken with cookie handling, but these
  are okay for the envisioned usage.
  Original author: dougz
  Merged from: //branches/donutburger/...

Automated import of CL 144094
2009-04-02 09:24:44 -07:00
Romain Guy
aaf25b5a66 Merge branch 'readonly-p4-master' 2009-04-02 09:20:36 -07:00
Romain Guy
7fb60b9b4e AI 144080: No need to merge. Fix the build.
Automated import of CL 144080
2009-04-02 09:19:22 -07:00
Bjorn Bringert
40c9703639 Merge branch 'readonly-p4-master' 2009-04-02 09:17:54 -07:00
Bjorn Bringert
3a184efa12 AI 144034: am: CL 144032 Added missing import to fix breakage caused by CL 144008.
Original author: bringert
  Merged from: //branches/donutburger/...

Automated import of CL 144034
2009-04-02 09:16:44 -07:00
Romain Guy
5a2f463fe5 Merge branch 'readonly-p4-master' 2009-04-02 09:04:51 -07:00
Romain Guy
10b4043c99 AI 144014: am: CL 144013 Rename PoolFactory to Pools, to follow the java.util convention (Collections, Arrays.)
Original author: romainguy
  Merged from: //branches/donutburger/...

Automated import of CL 144014
2009-04-02 09:03:39 -07:00
Bjorn Bringert
ffe5e10801 Merge branch 'readonly-p4-master' 2009-04-02 09:02:11 -07:00
Bjorn Bringert
5d015d7331 AI 144010: am: CL 144008 UriMatcher: Avoid repeated calls to Uri.getPathSegments()
in UriMatcher.match().
  Before, every call to UriMatcher.match() called
  Uri.getPathSegments() N + 1 times,
  where N is the size of the list returned by
  Uri.getPathSegments(). Since some of the implementations
  of Uri.getPathSegments() are O(N), UriMatcher.match() was O(N^2).
  This CL fixes the problem by calling uri.getPathSegments() once in
  the beginning of match(). That should be safe since Uri is
  immutable.
  Original author: bringert
  Merged from: //branches/donutburger/...

Automated import of CL 144010
2009-04-02 09:00:58 -07:00
Jeffrey Sharkey
5ed0ea8dbd Merge branch 'readonly-p4-master' 2009-04-02 08:56:44 -07:00
Jeffrey Sharkey
95a1b260fc AI 144005: Fix auto-merge method duplication that broke build.
Automated import of CL 144005
2009-04-02 08:55:32 -07:00
Tadashi Takaoka
6bbccae9b3 Merge branch 'readonly-p4-master' 2009-04-02 08:54:08 -07:00
Tadashi Takaoka
f26c6617a9 AI 144003: am: CL 144002 am: CL 144001 Fix tiny bug in Rfc822Token.java
Original author: takaoka
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144003
2009-04-02 08:52:56 -07:00
Grace Kloba
3c44286190 Merge branch 'readonly-p4-master' 2009-04-02 08:51:31 -07:00
Grace Kloba
a72cc098e2 AI 144000: am: CL 143999 am: CL 143998 Fix #1750489. Call WebKit's setNetworkOnLine from WebCore thread instead of UI thread as WebKit is not thread safe.
Using the same code pattern as the rest of the file:
  . throw IllegalStateException if BrowserFrame.sJavaBridge is null in pauseTimers/resumeTimers.
  . use (msg.arg1 == 1) to pass the boolean from WebView to WebViewCore as in CLEAR_CACHE
  Original author: klobag
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 144000
2009-04-02 08:50:17 -07:00