Commit Graph

122702 Commits

Author SHA1 Message Date
Eric Fischer
6ed9e06f4b AI 144556: Pick up today's modified translations.
Automated import of CL 144556
2009-04-03 17:19:55 -07:00
Mike Lockwood
907fb88a1d Merge branch 'readonly-p4-master' 2009-04-02 23:42:43 -07:00
Mike Lockwood
acbd5123e5 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:34 -07:00
Eric Fischer
574457c488 Merge branch 'readonly-p4-master' 2009-04-02 23:40:10 -07:00
Eric Fischer
d7d6fee0a2 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:39:00 -07:00
Eric Fischer
68a397de39 Merge branch 'readonly-p4-master' 2009-04-02 23:32:30 -07:00
Eric Fischer
5299fc1ff4 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
Amith Yamasani
b10a06de5c Merge branch 'readonly-p4-master' 2009-04-02 22:50:24 -07:00
Amith Yamasani
cc9ff9201e AI 144395: am: CL 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/...
  Original author: android-build

Automated import of CL 144395
2009-04-02 22:49:19 -07:00
Eric Fischer
2f7fe152f4 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:07 -07:00
Mike Lockwood
074149da80 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
e8302ee00e AI 144347: Reimport es_US translations in an attempt to fix the build.
Automated import of CL 144347
2009-04-02 17:15:44 -07:00
Eric Fischer
c32ca4f668 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:16 -07:00
Eric Fischer
a1823aedbf AI 144335: Import US Spanish translations, and a few Japanese changes.
Automated import of CL 144335
2009-04-02 16:39:23 -07:00
Amith Yamasani
4bfdcd3e5f 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
2009-04-02 11:40:25 -07:00
Amith Yamasani
55eb6580af 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
2009-04-02 11:39:09 -07:00
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