Commit Graph

116786 Commits

Author SHA1 Message Date
Wink Saville
1d98067994 Merge branch 'readonly-p4-master' 2009-04-02 11:02:16 -07:00
Wink Saville
c38866843e 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:56 -07:00
Wink Saville
f9e024198d AI 144185: Integrate cdma into the main code base.
Automated import of CL 144185
2009-04-02 01:37:03 -07:00
The Android Open Source Project
ea13ae392a Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:26 -07:00
Nick Pelly
b20dd917e2 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
2009-03-31 14:56:27 -07:00
Nick Pelly
0e2016789e AI 143812: am: CL 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/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143812
2009-03-31 14:42:35 -07:00
Eric Fischer
af7e1c9295 AI 143712: am: CL 143685 am: CL 143547 Import revised translations.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143712
2009-03-31 14:20:41 -07:00
Michael Chan
7ddcb36b52 AI 143628: am: CL 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.
  Original author: chanm
  Merged from: //branches/donutburger/...

Automated import of CL 143628
2009-03-31 13:55:18 -07:00
Nick Pelly
4220a1bdc1 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
2009-03-31 12:05:52 -07:00
Eric Fischer
6e811f2209 AI 143685: am: CL 143547 Import revised translations.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 143685
2009-03-31 11:11:17 -07:00
Eric Fischer
a81dce21d8 AI 143547: Import revised translations.
BUG=1738388

Automated import of CL 143547
2009-03-30 15:52:27 -07:00
Michael Chan
1739bfb333 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
2009-03-30 09:40:42 -07:00
The Android Open Source Project
21e9125c30 Merge branch 'open_source_no_contributions' into google_internal 2009-03-29 08:55:12 -07:00
Eric Fischer
d21d6e8762 AI 143367: am: CL 143217 am: CL 143012 Import revised Japanese translations.
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143367
2009-03-27 19:22:49 -07:00
Dianne Hackborn
4fcbec5536 AI 143364: am: CL 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/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143364
2009-03-27 19:19:20 -07:00
Eric Fischer
fc26ed791e AI 143217: am: CL 143012 Import revised Japanese translations.
Original author: enf
  Merged from: //branches/cupcake/...

Automated import of CL 143217
2009-03-27 18:53:32 -07:00
Dianne Hackborn
1be9343ee0 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
2009-03-27 18:26:13 -07:00
Michael Chan
4f5cd591f4 AI 143288: am: CL 143116 Added separate error messages for Bluetooth bonding rejections
and bonding failures due to down devices
  Original author: chanm
  Merged from: //branches/donutburger/...

Automated import of CL 143288
2009-03-27 17:04:53 -07:00
Ed Heyl
b5b40f86f4 AI 143278: Merge 142826: Add tutorial to platform. The tutorial can be launched with the new Intent ACTION_SYSTEM_TUTORIAL and
is available through Settings->About->System Tutorial

Automated import of CL 143278
2009-03-27 16:52:45 -07:00
The Android Open Source Project
a4b44a3b01 Merge commit 'korg/cupcake' 2009-03-27 15:31:13 -07:00
Michael Chan
a322045d92 AI 143116: Added separate error messages for Bluetooth bonding rejections
and bonding failures due to down devices
  BUG=1308546

Automated import of CL 143116
2009-03-27 11:53:26 -07:00
Eric Fischer
efa454e6b6 Automated import from //branches/cupcake/...@143012,143012 2009-03-26 16:45:45 -07:00
Dianne Hackborn
c78fd14489 Automated import from //branches/cupcake/...@143009,143009 2009-03-26 16:28:26 -07:00
Jim Miller
60af953bda Automated import from //branches/donutburger/...@142826,142826 2009-03-25 18:18:35 -07:00
Jim Miller
e709e243d5 Automated import from //branches/cupcake/...@142825,142825 2009-03-25 18:16:43 -07:00
Eric Fischer
3e3330de79 Automated import from //branches/donutburger/...@142720,142720 2009-03-25 17:04:29 -07:00
Eric Fischer
dd8373b001 Automated import from //branches/master/...@142759,142759 2009-03-25 16:13:53 -07:00
Eric Fischer
f2abab7920 Automated import from //branches/cupcake/...@142643,142643 2009-03-25 15:22:44 -07:00
Evan Millar
5990cc129c Automated import from //branches/master/...@142436,142436 2009-03-24 22:50:12 -07:00
Dianne Hackborn
4f7c1f740e Automated import from //branches/master/...@142401,142401 2009-03-24 22:45:38 -07:00
Evan Millar
83368552d1 Automated import from //branches/donutburger/...@142431,142431 2009-03-24 22:42:51 -07:00
Dianne Hackborn
6a5687ebf5 Automated import from //branches/donutburger/...@142396,142396 2009-03-24 22:39:12 -07:00
Suchi Amalapurapu
475b58296b Automated import from //branches/master/...@142035,142035 2009-03-24 21:25:01 -07:00
Suchi Amalapurapu
585ee96b91 Automated import from //branches/donutburger/...@142034,142034 2009-03-24 21:20:18 -07:00
Eric Fischer
4d1de8cebd Automated import from //branches/master/...@141869,141869 2009-03-24 21:06:32 -07:00
Eric Fischer
cfb25b20e7 Automated import from //branches/donutburger/...@141868,141868 2009-03-24 21:02:50 -07:00
Jeffrey Sharkey
173545e63b Automated import from //branches/master/...@141652,141652 2009-03-24 20:43:02 -07:00
Jeffrey Sharkey
3f9aa9ad01 Automated import from //branches/donutburger/...@141651,141651 2009-03-24 20:41:22 -07:00
Mike Ritter
d166402fc3 Automated import from //branches/donutburger/...@141180,141180 2009-03-24 19:44:13 -07:00
Mike Ritter
18f3afb9cd Automated import from //branches/master/...@141186,141186 2009-03-24 19:43:56 -07:00
Evan Millar
e1131dbf76 Automated import from //branches/cupcake/...@142429,142429 2009-03-24 19:42:31 -07:00
Dianne Hackborn
99f095dfde Automated import from //branches/cupcake/...@142391,142391 2009-03-24 19:36:34 -07:00
Dianne Hackborn
f9359baca6 Automated import from //branches/master/...@141019,141019 2009-03-24 19:15:18 -07:00
Dianne Hackborn
b2d3e60478 Automated import from //branches/donutburger/...@141018,141018 2009-03-24 19:15:15 -07:00
Michael Chan
5d9d203fd8 Automated import from //branches/master/...@140899,140899 2009-03-24 18:53:04 -07:00
Michael Chan
097ed6c671 Automated import from //branches/donutburger/...@140897,140897 2009-03-24 18:52:49 -07:00
Suchi Amalapurapu
e32e8efcb9 Automated import from //branches/cupcake/...@142033,142033 2009-03-24 18:51:34 -07:00
Suchi Amalapurapu
ff271ce1b7 Automated import from //branches/master/...@140879,140879 2009-03-24 18:48:06 -07:00
Suchi Amalapurapu
b22cc18118 Automated import from //branches/donutburger/...@140876,140876 2009-03-24 18:47:42 -07:00
Eric Fischer
c18f0c6210 Automated import from //branches/master/...@140875,140875 2009-03-24 18:47:15 -07:00