OSDN Git Service
Robert Greenwalt [Wed, 6 May 2009 17:10:42 +0000 (10:10 -0700)]
Fix locale selection to never chose a lang-only locale.
This avoids us using the non-standard lang-only locale when communicating
off device. Fixes
1810133.
Eric Fischer [Fri, 1 May 2009 00:59:37 +0000 (17:59 -0700)]
am
9d2976a: AI 148147: Import lots of zh_TW translation changes.
Merge commit '
9d2976a10baf1c26997c4db02babb14b5bd9204d' into donut
* commit '
9d2976a10baf1c26997c4db02babb14b5bd9204d':
AI 148147: Import lots of zh_TW translation changes.
Eric Fischer [Fri, 1 May 2009 00:32:16 +0000 (17:32 -0700)]
AI 148147: Import lots of zh_TW translation changes.
Automated import of CL 148147
Eric Fischer [Fri, 1 May 2009 00:10:48 +0000 (17:10 -0700)]
am
554c844: AI 148026: Update zh_TW translations.
Merge commit '
554c844c7d010f21acb210abab1818d8cbe3dabf' into donut
* commit '
554c844c7d010f21acb210abab1818d8cbe3dabf':
AI 148026: Update zh_TW translations.
Eric Fischer [Thu, 30 Apr 2009 23:48:34 +0000 (16:48 -0700)]
AI 148026: Update zh_TW translations.
Automated import of CL 148026
Android (Google) Code Review [Wed, 29 Apr 2009 21:44:34 +0000 (14:44 -0700)]
Merge change 750 into donut
* changes:
Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
Michael Chan [Wed, 29 Apr 2009 21:17:06 +0000 (14:17 -0700)]
Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
In the BroadcastReceiver, pickup the new bluetooth status from the intent instead
of calling back to LocalBluetoothManager. There could be race condition since
LocalBluetoothManager itself gets the same info via the BroadcastReceiver mechanism.
Also cleaned up logs.
Eric Fischer [Wed, 29 Apr 2009 04:59:21 +0000 (21:59 -0700)]
am
b95a2c9: AI 147962: Import updated zh_TW translations.
Merge commit '
b95a2c92c0542b19d92a03cfefb23454e3ff5bd3' into donut
* commit '
b95a2c92c0542b19d92a03cfefb23454e3ff5bd3':
AI 147962: Import updated zh_TW translations.
Eric Fischer [Wed, 29 Apr 2009 04:59:21 +0000 (21:59 -0700)]
am
1fa983e: AI 147492: Update zh_TW translations.
Merge commit '
1fa983eb05284ac31eca4cb68de2783117dde155' into donut
* commit '
1fa983eb05284ac31eca4cb68de2783117dde155':
AI 147492: Update zh_TW translations.
Eric Fischer [Tue, 28 Apr 2009 22:48:40 +0000 (15:48 -0700)]
AI 147962: Import updated zh_TW translations.
Automated import of CL 147962
Bjorn Bringert [Mon, 27 Apr 2009 14:16:25 +0000 (15:16 +0100)]
Show Search settings in Settings app.
The Settings app now shows a "Search settings" item,
if there is an activity that handles the Search settings intent.
This conditionally included settings is handled in the same way
as the sync settings.
Eric Fischer [Thu, 23 Apr 2009 18:59:15 +0000 (11:59 -0700)]
AI 147492: Update zh_TW translations.
Automated import of CL 147492
Jean-Baptiste Queru [Thu, 23 Apr 2009 00:56:59 +0000 (17:56 -0700)]
merge cupcake into donut
Android (Google) Code Review [Mon, 20 Apr 2009 21:45:51 +0000 (14:45 -0700)]
Merge change 201 into donut
* changes:
Dismiss the dialog in onDestroy so that it doesn't leak on orientation change or other transitions.
Amith Yamasani [Wed, 15 Apr 2009 21:42:32 +0000 (14:42 -0700)]
Dismiss the dialog in onDestroy so that it doesn't leak on orientation change or other transitions.
Evan Millar [Sat, 18 Apr 2009 19:27:52 +0000 (12:27 -0700)]
Merge branch 'readonly-p4-donut' into donut
Evan Millar [Sat, 18 Apr 2009 19:26:34 +0000 (12:26 -0700)]
AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=
1755458
Automated import of CL 146853
Eric Fischer [Wed, 15 Apr 2009 20:30:20 +0000 (13:30 -0700)]
AI 146365: Import revised translations.
DO NOT MERGE
Automated import of CL 146365
Eric Fischer [Tue, 14 Apr 2009 19:10:44 +0000 (12:10 -0700)]
AI 146175: Import updated translations.
Automated import of CL 146175
Eric Fischer [Tue, 14 Apr 2009 00:54:29 +0000 (17:54 -0700)]
Merge branch 'readonly-p4-donut' into donut
Eric Fischer [Tue, 14 Apr 2009 00:53:11 +0000 (17:53 -0700)]
AI 145973: am: CL 145787 Add localized time zone names from CLDR-1.6.1.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 145973
Eric Fischer [Tue, 14 Apr 2009 00:16:20 +0000 (17:16 -0700)]
AI 146037: Import updated translations.
Automated import of CL 146037
Eric Fischer [Mon, 13 Apr 2009 16:01:43 +0000 (09:01 -0700)]
Merge branch 'readonly-p4-donut' into donut
Eric Fischer [Mon, 13 Apr 2009 16:00:31 +0000 (09:00 -0700)]
AI 145862: am: CL 145584 Make date/time dialog titles translatable.
Remove the "do not translate" annotation from the strings.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 145862
Jim Miller [Mon, 13 Apr 2009 15:59:09 +0000 (08:59 -0700)]
Merge branch 'readonly-p4-donut' into donut
Jim Miller [Mon, 13 Apr 2009 15:57:57 +0000 (08:57 -0700)]
AI 145861: am: CL 145578 Tweak buttons in ChooseLockPatternTutorial to accomodate more text and marquee if necessary.
Original author: jaggies
Merged from: //branches/cupcake/...
Automated import of CL 145861
Eric Fischer [Fri, 10 Apr 2009 23:46:01 +0000 (16:46 -0700)]
AI 145787: Add localized time zone names from CLDR-1.6.1.
BUG=
1776316,
1769241
Automated import of CL 145787
Eric Fischer [Fri, 10 Apr 2009 17:45:20 +0000 (10:45 -0700)]
AI 145711: Import a few changed translations.
DO NOT MERGE
Automated import of CL 145711
Eric Fischer [Fri, 10 Apr 2009 00:43:57 +0000 (17:43 -0700)]
AI 145584: Make date/time dialog titles translatable.
Remove the "do not translate" annotation from the strings.
BUG=
1779128
Automated import of CL 145584
Jim Miller [Fri, 10 Apr 2009 00:26:27 +0000 (17:26 -0700)]
AI 145578: Tweak buttons in ChooseLockPatternTutorial to accomodate more text and marquee if necessary.
BUG=
1776037
Automated import of CL 145578
Eric Fischer [Thu, 9 Apr 2009 21:34:00 +0000 (14:34 -0700)]
Merge branch 'readonly-p4-donut' into donut
Eric Fischer [Thu, 9 Apr 2009 21:32:43 +0000 (14:32 -0700)]
AI 145493: am: CL 145214 Update cupcake translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 145493
Eric Fischer [Thu, 9 Apr 2009 01:43:30 +0000 (18:43 -0700)]
AI 145225: Import more revised translations into cupcake.
Automated import of CL 145225
Eric Fischer [Wed, 8 Apr 2009 22:59:36 +0000 (15:59 -0700)]
AI 145214: Update cupcake translations.
Automated import of CL 145214
Eric Fischer [Wed, 8 Apr 2009 01:15:15 +0000 (18:15 -0700)]
AI 144977: Import revised translations.
DO NOT MERGE
Automated import of CL 144977
Suchi Amalapurapu [Tue, 7 Apr 2009 21:22:58 +0000 (14:22 -0700)]
Recalculate storage size in onStart rather than onCreate
Refresh the size info by invoking PackageManager API in onStart so that
the activity shows accurate storage information on being restarted.
Eric Fischer [Tue, 7 Apr 2009 20:55:06 +0000 (13:55 -0700)]
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
Eric Fischer [Tue, 7 Apr 2009 18:48:29 +0000 (11:48 -0700)]
AI 144891: Import a bunch of revised translations.
Automated import of CL 144891
Mike Lockwood [Sun, 5 Apr 2009 18:35:30 +0000 (11:35 -0700)]
AI 144591: Fix ClassCastException in RadioInfo settings screen.
BUG=
1761604
Automated import of CL 144591
Eric Fischer [Sat, 4 Apr 2009 00:21:53 +0000 (17:21 -0700)]
AI 144558: am: CL 144556 Pick up today's modified translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 144558
Eric Fischer [Sat, 4 Apr 2009 00:19:55 +0000 (17:19 -0700)]
AI 144556: Pick up today's modified translations.
Automated import of CL 144556
Eric Fischer [Fri, 3 Apr 2009 04:42:07 +0000 (21:42 -0700)]
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
Mike Lockwood [Fri, 3 Apr 2009 04:41:57 +0000 (21:41 -0700)]
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
Eric Fischer [Fri, 3 Apr 2009 00:15:44 +0000 (17:15 -0700)]
AI 144347: Reimport es_US translations in an attempt to fix the build.
Automated import of CL 144347
Eric Fischer [Thu, 2 Apr 2009 23:42:16 +0000 (16:42 -0700)]
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
Eric Fischer [Thu, 2 Apr 2009 23:39:23 +0000 (16:39 -0700)]
AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
Amith Yamasani [Thu, 2 Apr 2009 18:40:25 +0000 (11:40 -0700)]
AI 144257: am: CL 144256 Need to show opt-in screen for location collection.
Added a screen to the setup wizard, after login, to ask user to
opt-in for location collection.
Added a dialog to Settings when user turns on Network location.
Fixed a security permission issue in LocationManagerService related
to this change.
Original author: yamasani
Merged from: //branches/cupcake/...
Automated import of CL 144257
Amith Yamasani [Thu, 2 Apr 2009 18:39:09 +0000 (11:39 -0700)]
AI 144256: Need to show opt-in screen for location collection.
Added a screen to the setup wizard, after login, to ask user to
opt-in for location collection.
Added a dialog to Settings when user turns on Network location.
Fixed a security permission issue in LocationManagerService related
to this change.
BUG=
1752566
Automated import of CL 144256
Wink Saville [Thu, 2 Apr 2009 08:37:03 +0000 (01:37 -0700)]
AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
Nick Pelly [Tue, 31 Mar 2009 21:56:27 +0000 (14:56 -0700)]
AI 143788: am: CL 143740 Don't clear supported profiles in settings app if getRemoteClass returns error.
Also clean up the error codes returned by the framework, so that the settings app can properly detect an error.
Original author: npelly
Merged from: //branches/cupcake/...
Automated import of CL 143788
Nick Pelly [Tue, 31 Mar 2009 19:05:52 +0000 (12:05 -0700)]
AI 143740: Don't clear supported profiles in settings app if getRemoteClass returns error.
Also clean up the error codes returned by the framework, so that the settings app can properly detect an error.
BUG=
1748881
Automated import of CL 143740
Eric Fischer [Tue, 31 Mar 2009 18:11:17 +0000 (11:11 -0700)]
AI 143685: am: CL 143547 Import revised translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 143685
Eric Fischer [Mon, 30 Mar 2009 22:52:27 +0000 (15:52 -0700)]
AI 143547: Import revised translations.
BUG=
1738388
Automated import of CL 143547
Michael Chan [Mon, 30 Mar 2009 16:40:42 +0000 (09:40 -0700)]
AI 143480: Fixed the problem where Settings would crash if you enable airplane mode, go
Home, go back to Wireless Settings. This only happens in emulator. Bluetooth
isn't supported in emulator but the crash was fixed so users can
enable/disable Airplane Mode.
BUG=
1741119
Automated import of CL 143480
Eric Fischer [Sat, 28 Mar 2009 01:53:32 +0000 (18:53 -0700)]
AI 143217: am: CL 143012 Import revised Japanese translations.
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 143217
Dianne Hackborn [Sat, 28 Mar 2009 01:26:13 +0000 (18:26 -0700)]
AI 143214: am: CL 143009 More work on issue #
1739507 (kila-user build is too big): remove some unused application resources I found.
Original author: hackbod
Merged from: //branches/cupcake/...
Automated import of CL 143214
Michael Chan [Fri, 27 Mar 2009 18:53:26 +0000 (11:53 -0700)]
AI 143116: Added separate error messages for Bluetooth bonding rejections
and bonding failures due to down devices
BUG=
1308546
Automated import of CL 143116
Eric Fischer [Thu, 26 Mar 2009 23:45:45 +0000 (16:45 -0700)]
Automated import from //branches/cupcake/...@143012,143012
Dianne Hackborn [Thu, 26 Mar 2009 23:28:26 +0000 (16:28 -0700)]
Automated import from //branches/cupcake/...@143009,143009
Jim Miller [Thu, 26 Mar 2009 01:18:35 +0000 (18:18 -0700)]
Automated import from //branches/donutburger/...@142826,142826
Jim Miller [Thu, 26 Mar 2009 01:16:43 +0000 (18:16 -0700)]
Automated import from //branches/cupcake/...@142825,142825
Eric Fischer [Thu, 26 Mar 2009 00:04:29 +0000 (17:04 -0700)]
Automated import from //branches/donutburger/...@142720,142720
Eric Fischer [Wed, 25 Mar 2009 22:22:44 +0000 (15:22 -0700)]
Automated import from //branches/cupcake/...@142643,142643
Evan Millar [Wed, 25 Mar 2009 05:42:51 +0000 (22:42 -0700)]
Automated import from //branches/donutburger/...@142431,142431
Dianne Hackborn [Wed, 25 Mar 2009 05:39:12 +0000 (22:39 -0700)]
Automated import from //branches/donutburger/...@142396,142396
Suchi Amalapurapu [Wed, 25 Mar 2009 04:20:18 +0000 (21:20 -0700)]
Automated import from //branches/donutburger/...@142034,142034
Eric Fischer [Wed, 25 Mar 2009 04:02:50 +0000 (21:02 -0700)]
Automated import from //branches/donutburger/...@141868,141868
Jeffrey Sharkey [Wed, 25 Mar 2009 03:41:22 +0000 (20:41 -0700)]
Automated import from //branches/donutburger/...@141651,141651
Mike Ritter [Wed, 25 Mar 2009 02:44:13 +0000 (19:44 -0700)]
Automated import from //branches/donutburger/...@141180,141180
Evan Millar [Wed, 25 Mar 2009 02:42:31 +0000 (19:42 -0700)]
Automated import from //branches/cupcake/...@142429,142429
Dianne Hackborn [Wed, 25 Mar 2009 02:36:34 +0000 (19:36 -0700)]
Automated import from //branches/cupcake/...@142391,142391
Dianne Hackborn [Wed, 25 Mar 2009 02:15:15 +0000 (19:15 -0700)]
Automated import from //branches/donutburger/...@141018,141018
Michael Chan [Wed, 25 Mar 2009 01:52:49 +0000 (18:52 -0700)]
Automated import from //branches/donutburger/...@140897,140897
Suchi Amalapurapu [Wed, 25 Mar 2009 01:51:34 +0000 (18:51 -0700)]
Automated import from //branches/cupcake/...@142033,142033
Suchi Amalapurapu [Wed, 25 Mar 2009 01:47:42 +0000 (18:47 -0700)]
Automated import from //branches/donutburger/...@140876,140876
Eric Fischer [Wed, 25 Mar 2009 01:47:01 +0000 (18:47 -0700)]
Automated import from //branches/donutburger/...@140873,140873
Joe Onorato [Wed, 25 Mar 2009 01:40:50 +0000 (18:40 -0700)]
Automated import from //branches/donutburger/...@140841,140841
Eric Fischer [Wed, 25 Mar 2009 01:33:42 +0000 (18:33 -0700)]
Automated import from //branches/cupcake/...@141866,141866
John Huang [Wed, 25 Mar 2009 01:26:28 +0000 (18:26 -0700)]
Automated import from //branches/donutburger/...@140756,140756
Jeffrey Sharkey [Wed, 25 Mar 2009 01:04:36 +0000 (18:04 -0700)]
Automated import from //branches/cupcake/...@141650,141650
Joe Onorato [Wed, 25 Mar 2009 00:49:03 +0000 (17:49 -0700)]
Automated import from //branches/donutburger/...@140511,140511
Jason Parekh [Wed, 25 Mar 2009 00:48:28 +0000 (17:48 -0700)]
Automated import from //branches/donutburger/...@140507,140507
The Android Open Source Project [Fri, 20 Mar 2009 06:08:56 +0000 (23:08 -0700)]
auto import from //branches/cupcake_rel/...@141571
The Android Open Source Project [Thu, 19 Mar 2009 00:39:48 +0000 (17:39 -0700)]
auto import from //branches/cupcake_rel/...@140373
The Android Open Source Project [Fri, 13 Mar 2009 20:04:25 +0000 (13:04 -0700)]
auto import from //branches/cupcake_rel/...@138607
The Android Open Source Project [Wed, 11 Mar 2009 19:11:59 +0000 (12:11 -0700)]
auto import from //branches/cupcake/...@137873
The Android Open Source Project [Mon, 9 Mar 2009 18:52:14 +0000 (11:52 -0700)]
auto import from //branches/cupcake/...@137197
The Android Open Source Project [Thu, 5 Mar 2009 22:34:39 +0000 (14:34 -0800)]
auto import from //depot/cupcake/@136594
The Android Open Source Project [Wed, 4 Mar 2009 03:32:34 +0000 (19:32 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Wed, 4 Mar 2009 02:28:52 +0000 (18:28 -0800)]
auto import from //depot/cupcake/@135843
The Android Open Source Project [Tue, 3 Mar 2009 22:04:35 +0000 (14:04 -0800)]
auto import from //depot/cupcake/@132589
The Android Open Source Project [Tue, 3 Mar 2009 06:54:43 +0000 (22:54 -0800)]
auto import from //depot/cupcake/@137055
The Android Open Source Project [Fri, 20 Feb 2009 15:38:33 +0000 (07:38 -0800)]
auto import from //branches/cupcake/...@132569
The Android Open Source Project [Thu, 19 Feb 2009 18:57:36 +0000 (10:57 -0800)]
auto import from //branches/cupcake/...@132276
The Android Open Source Project [Fri, 13 Feb 2009 20:57:53 +0000 (12:57 -0800)]
auto import from //branches/cupcake/...@131421
The Android Open Source Project [Tue, 10 Feb 2009 23:44:05 +0000 (15:44 -0800)]
auto import from //branches/cupcake/...@130745
The Android Open Source Project [Thu, 22 Jan 2009 08:13:44 +0000 (00:13 -0800)]
auto import from //branches/cupcake/...@127436
The Android Open Source Project [Tue, 20 Jan 2009 22:04:01 +0000 (14:04 -0800)]
auto import from //branches/cupcake/...@127101
The Android Open Source Project [Fri, 16 Jan 2009 00:12:13 +0000 (16:12 -0800)]
auto import from //branches/cupcake/...@126645
The Android Open Source Project [Sat, 10 Jan 2009 01:51:25 +0000 (17:51 -0800)]
auto import from //branches/cupcake/...@125939