2627 Commits

Author SHA1 Message Date
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
Dianne Hackborn
6447ca30b8 Fix issue #1769910 (Track activity launch times)
The usage stats service now collects per-activity launch time stats.  There are a number of fixes and improvements to its statistics management and collection; it now operates its calendar in GMT and ensures that for checkin purposes it always reports one day and only one complete day to the checkin service.

Also change the checkin option from "-c" to "--checkin" since it is really a special thing.
2009-04-07 19:50:08 -07:00
Eric Fischer
bb4de4bcbe AI 144977: Import revised translations.
DO NOT MERGE

Automated import of CL 144977
2009-04-07 18:15:15 -07:00
Cynthia Wong
36f9b695a1 Merge branch 'readonly-p4-donut' into donut 2009-04-07 17:25:27 -07:00
Cynthia Wong
f62b80fa1b AI 144928: Make the uphill discarding ops functionality controllable via a Gservices flag
BUG=1725022

Automated import of CL 144928
2009-04-07 17:24:14 -07:00
Android (Google) Code Review
ed571ea7c6 Merge change 37 into donut
* changes:
  Preserve an Activity's setIntent() state across relaunches
2009-04-07 16:54:26 -07:00
Christopher Tate
b70f3dff01 Preserve an Activity's setIntent() state across relaunches
Previously any Intent designated by setIntent() would be lost when
the Activity was shut down and restarted due to orientation change.
Now the custom intent is preserved across the relaunch.

Bug: b/1743425
2009-04-07 16:07:59 -07:00
Eric Fischer
374c83f420 AI 144912: Merge from cupcake:
Change 144891 on 2009/04/07 by enf@ebcdic
  Import a bunch of revised translations.

Automated import of CL 144912
2009-04-07 13:55:05 -07:00
Eric Fischer
f845cd4f23 AI 144891: Import a bunch of revised translations.
Automated import of CL 144891
2009-04-07 11:48:29 -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
Wink Saville
d6c5d527d3 AI 144705: Teleca patch from 03/27/2009, fixes some CDMA issues.
Automated import of CL 144705
2009-04-06 15:20:45 -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
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
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
Mike Lockwood
80e1212977 AI 144459: Add "tty" to the status bar to fix the StatusBarService.
BUG=1761602

Automated import of CL 144459
2009-04-03 09:46:32 -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
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
Eric Fischer
1015b379bc AI 144355: Automated g4 rollback of changelist 144335.
*** Reason for rollback ***
  Roll back US Spanish import because it made the build too big.
  *** Original change description ***
  Import US Spanish translations, and a few Japanese changes.

Automated import of CL 144355
2009-04-02 21:42:04 -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
Eric Fischer
f80f5d02ed AI 144347: Reimport es_US translations in an attempt to fix the build.
Automated import of CL 144347
2009-04-02 17:15:43 -07:00
Eric Fischer
2a3ce28251 AI 144336: am: CL 144335 Import US Spanish translations, and a few Japanese changes.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 144336
2009-04-02 16:42:13 -07:00
Eric Fischer
0c65631515 AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
2009-04-02 16:39:20 -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