PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85 Commits 1 Branch 0 Tags
743182c668be8dc4efdd33a5dd3e2f3a12868b75
Commit Graph

85 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
d6af07cdbb Merge branch 'readonly-p4-master' 2009-04-09 14:33:11 -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
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
Mike Lockwood
c06861f058 Merge branch 'readonly-p4-master' 2009-04-05 11:39:00 -07:00
Mike Lockwood
5304c7e38f AI 144592: am: CL 144591 Fix ClassCastException in RadioInfo settings screen. 
BUG=1761604
  Original author: lockwood

Automated import of CL 144592
 2009-04-05 11:37:45 -07:00
Eric Fischer
fe2d34b25d Merge branch 'readonly-p4-master' 2009-04-03 17:26:03 -07:00
Eric Fischer
6bced002bc AI 144560: am: CL 144558 am: CL 144556 Pick up today's modified translations. 
Original author: enf
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144560
 2009-04-03 17:24:50 -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
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
The Android Open Source Project
ea13ae392a Merge commit 'goog/readonly-p4-master' 2009-03-31 21:34:26 -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
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
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
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
e709e243d5 Automated import from //branches/cupcake/...@142825,142825 2009-03-25 18:16:43 -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
Suchi Amalapurapu
475b58296b Automated import from //branches/master/...@142035,142035 2009-03-24 21:25:01 -07:00
Eric Fischer
4d1de8cebd Automated import from //branches/master/...@141869,141869 2009-03-24 21:06:32 -07:00
Jeffrey Sharkey
173545e63b Automated import from //branches/master/...@141652,141652 2009-03-24 20:43:02 -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