Android (Google) Code Review
93e1d0ab6b
am b2f497f
: Merge change 750 into donut
...
Merge commit 'b2f497f8bb42bde197af7e3bab56661ce82f3a2d'
* commit 'b2f497f8bb42bde197af7e3bab56661ce82f3a2d':
Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
2009-04-29 15:17:17 -07:00
Android (Google) Code Review
b2f497f8bb
Merge change 750 into donut
...
* changes:
Fixed the Bluetooth On/Off Checkbox in settings so it is enabled/disable properly.
2009-04-29 14:44:34 -07:00
Michael Chan
f25063aee3
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.
2009-04-29 14:17:06 -07:00
Eric Fischer
3c70438c71
am edec69d
: am b95a2c9
: AI 147962: Import updated zh_TW translations.
...
Merge commit 'edec69d61909b29f8bfa3556a8ce5aa7a52dae78'
* commit 'edec69d61909b29f8bfa3556a8ce5aa7a52dae78':
AI 147962: Import updated zh_TW translations.
2009-04-29 13:43:32 -07:00
Eric Fischer
ea9ba9d6f1
am 33d0fa6
: am 1fa983e
: AI 147492: Update zh_TW translations.
...
Merge commit '33d0fa6f94e19513825658c8522daa530dcdeadd'
* commit '33d0fa6f94e19513825658c8522daa530dcdeadd':
AI 147492: Update zh_TW translations.
2009-04-29 13:43:32 -07:00
Bjorn Bringert
3f6acd807c
am a9d5be1
: Show Search settings in Settings app.
...
Merge commit 'a9d5be1e5f49c272aa445c5c66e07df81d8bfc27'
* commit 'a9d5be1e5f49c272aa445c5c66e07df81d8bfc27':
Show Search settings in Settings app.
2009-04-29 13:43:32 -07:00
Eric Fischer
edec69d619
am b95a2c9
: AI 147962: Import updated zh_TW translations.
...
Merge commit 'b95a2c92c0542b19d92a03cfefb23454e3ff5bd3' into donut
* commit 'b95a2c92c0542b19d92a03cfefb23454e3ff5bd3':
AI 147962: Import updated zh_TW translations.
2009-04-28 21:59:21 -07:00
Eric Fischer
33d0fa6f94
am 1fa983e
: AI 147492: Update zh_TW translations.
...
Merge commit '1fa983eb05284ac31eca4cb68de2783117dde155' into donut
* commit '1fa983eb05284ac31eca4cb68de2783117dde155':
AI 147492: Update zh_TW translations.
2009-04-28 21:59:21 -07:00
Eric Fischer
b95a2c92c0
AI 147962: Import updated zh_TW translations.
...
Automated import of CL 147962
2009-04-28 15:48:40 -07:00
Bjorn Bringert
a9d5be1e5f
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.
2009-04-27 15:16:25 +01:00
The Android Open Source Project
23c9158d2c
Merge commit 'korg/donut'
2009-04-24 13:55:02 -07:00
Eric Fischer
1fa983eb05
AI 147492: Update zh_TW translations.
...
Automated import of CL 147492
2009-04-23 11:59:15 -07:00
Jean-Baptiste Queru
ad64b8aae1
Merge donut into master
2009-04-22 18:33:19 -07:00
Jean-Baptiste Queru
d842cee7c2
merge cupcake into donut
2009-04-22 17:56:59 -07:00
Jean-Baptiste Queru
9b64ef4b44
Merge donut into master
2009-04-22 17:12:39 -07:00
Android (Google) Code Review
0306e8b7dc
Merge change 201 into donut
...
* changes:
Dismiss the dialog in onDestroy so that it doesn't leak on orientation change or other transitions.
2009-04-20 14:45:51 -07:00
Amith Yamasani
519e321609
Dismiss the dialog in onDestroy so that it doesn't leak on orientation change or other transitions.
2009-04-20 14:22:43 -07:00
Evan Millar
743182c668
Merge branch 'readonly-p4-master'
2009-04-18 23:36:22 -07:00
Evan Millar
72a2da9f9e
AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
...
Original author: emillar
Automated import of CL 146854
2009-04-18 23:35:04 -07:00
Evan Millar
9aacc30ad7
Merge branch 'readonly-p4-donut' into donut
2009-04-18 12:27:52 -07:00
Evan Millar
7e85a6f8c6
AI 146853: Add kernel wakelock data to batteryinfo dump.
...
BUG=1755458
Automated import of CL 146853
2009-04-18 12:26:34 -07:00
Eric Fischer
43f027a086
AI 146365: Import revised translations.
...
DO NOT MERGE
Automated import of CL 146365
2009-04-15 13:30:20 -07:00
The Android Open Source Project
607aa1a71d
Merge commit 'korg/cupcake'
2009-04-14 18:18:16 -07:00
Eric Fischer
3d794d1542
Merge branch 'readonly-p4-master'
2009-04-14 14:38:55 -07:00
Eric Fischer
d929bb0973
AI 146181: am: CL 145973 am: CL 145787 Add localized time zone names from CLDR-1.6.1.
...
Original author: enf
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146181
2009-04-14 14:37:37 -07:00
Eric Fischer
9a2ab46eb8
AI 146175: Import updated translations.
...
Automated import of CL 146175
2009-04-14 12:10:44 -07:00
Eric Fischer
69720d1db3
Merge branch 'readonly-p4-donut' into donut
2009-04-13 17:54:29 -07:00
Eric Fischer
1f06e4f99b
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
2009-04-13 17:53:11 -07:00
Eric Fischer
2ad8713da2
AI 146037: Import updated translations.
...
Automated import of CL 146037
2009-04-13 17:16:20 -07:00
Eric Fischer
4d05b093ee
Merge branch 'readonly-p4-master'
2009-04-13 17:04:29 -07:00
Eric Fischer
cf781ffa62
AI 146014: am: CL 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/...
Original author: android-build
Automated import of CL 146014
2009-04-13 17:03:09 -07:00
Jim Miller
a07fcfefd6
Merge branch 'readonly-p4-master'
2009-04-13 17:01:40 -07:00
Jim Miller
bdcc4e69ff
AI 146013: am: CL 145861 am: CL 145578 Tweak buttons in ChooseLockPatternTutorial to accomodate more text and marquee if necessary.
...
Original author: jaggies
Merged from: //branches/cupcake/...
Original author: android-build
Automated import of CL 146013
2009-04-13 17:00:16 -07:00
Eric Fischer
79e92a5310
Merge branch 'readonly-p4-donut' into donut
2009-04-13 09:01:43 -07:00
Eric Fischer
589ad8c649
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
2009-04-13 09:00:31 -07:00
Jim Miller
f56eb33665
Merge branch 'readonly-p4-donut' into donut
2009-04-13 08:59:09 -07:00
Jim Miller
bd092fc446
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
2009-04-13 08:57:57 -07:00
Eric Fischer
c1734bd5ca
AI 145787: Add localized time zone names from CLDR-1.6.1.
...
BUG=1776316,1769241
Automated import of CL 145787
2009-04-10 16:46:01 -07:00
Eric Fischer
364e6a8c85
AI 145711: Import a few changed translations.
...
DO NOT MERGE
Automated import of CL 145711
2009-04-10 10:45:20 -07:00
Eric Fischer
55122a3bdf
AI 145584: Make date/time dialog titles translatable.
...
Remove the "do not translate" annotation from the strings.
BUG=1779128
Automated import of CL 145584
2009-04-09 17:43:57 -07:00
Jim Miller
0f11a7626c
AI 145578: Tweak buttons in ChooseLockPatternTutorial to accomodate more text and marquee if necessary.
...
BUG=1776037
Automated import of CL 145578
2009-04-09 17:26:27 -07:00
Eric Fischer
acabd05f1c
Merge branch 'readonly-p4-donut' into donut
2009-04-09 14:34:00 -07:00
Eric Fischer
d6af07cdbb
Merge branch 'readonly-p4-master'
2009-04-09 14:33:11 -07:00
Eric Fischer
677e6cfb82
AI 145493: am: CL 145214 Update cupcake translations.
...
Original author: enf
Merged from: //branches/cupcake/...
Automated import of CL 145493
2009-04-09 14:32:43 -07:00
Eric Fischer
dc8807a9c2
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
Eric Fischer
9b0619e13c
AI 145225: Import more revised translations into cupcake.
...
Automated import of CL 145225
2009-04-08 18:43:30 -07:00
Eric Fischer
88d6514aed
AI 145214: Update cupcake translations.
...
Automated import of CL 145214
2009-04-08 15:59:36 -07:00
Eric Fischer
25e1abb67b
Merge branch 'readonly-p4-master'
2009-04-08 00:31:53 -07:00
Eric Fischer
49fe20c9b0
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
Eric Fischer
9b37d192ab
AI 144977: Import revised translations.
...
DO NOT MERGE
Automated import of CL 144977
2009-04-07 18:15:15 -07:00