OSDN Git Service

android-x86/packages-apps-Settings.git
12 years agoMerge "Update the title for the spell checker"
satok [Wed, 8 Feb 2012 03:28:14 +0000 (19:28 -0800)]
Merge "Update the title for the spell checker"

12 years agoUpdate the title for the spell checker
satok [Wed, 8 Feb 2012 02:10:32 +0000 (11:10 +0900)]
Update the title for the spell checker

Bug: 5819988

Change-Id: I5420313f319eb447087b69dcda5b7c93bffc74b5

12 years agoNew dev setting to turn off HW overlays.
Dianne Hackborn [Tue, 7 Feb 2012 05:21:39 +0000 (21:21 -0800)]
New dev setting to turn off HW overlays.

Change-Id: I747ac6d90dfb8a7a0bbf547ce7cae8ee86f8d5d0

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 7 Feb 2012 19:01:28 +0000 (11:01 -0800)]
Import translations. DO NOT MERGE

Change-Id: I409990d7cb8653f957aef23a8c2407f41a4b5214

12 years agoam b0d203c3: (-s ours) am 4bec429d: Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:52:29 +0000 (12:52 -0800)]
am b0d203c3: (-s ours) am 4bec429d: Import translations. DO NOT MERGE

* commit 'b0d203c395ddc16860241381032a5c8b8e870e60':
  Import translations. DO NOT MERGE

12 years agoam 4bec429d: Import translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:50:21 +0000 (12:50 -0800)]
am 4bec429d: Import translations. DO NOT MERGE

* commit '4bec429dd5a6f22b3a23aff8ed29b7a68786bba5':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:44:41 +0000 (12:44 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia6cf10c2506a1b4580db7040b98d71ee68715990

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 6 Feb 2012 20:43:39 +0000 (12:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: I615776e4f0521a14747ecf6f9e7f8a695bc128b9

12 years agoLinear bytes scale, time ticks on first week day.
Jeff Sharkey [Sat, 4 Feb 2012 03:27:07 +0000 (19:27 -0800)]
Linear bytes scale, time ticks on first week day.

Move bytes to linear instead of logarithmic scale.  Also render time
ticks on first week day based on locale.  Also enable testing of
specific IMSI through setprop.

Bug: 54526125829693
Change-Id: I13200cf58a39bfe0ac343e1f83165e899867641b

12 years agoMerge "Tighten locking around data usage UID resolution."
Jeff Sharkey [Fri, 3 Feb 2012 23:51:40 +0000 (15:51 -0800)]
Merge "Tighten locking around data usage UID resolution."

12 years agoTighten locking around data usage UID resolution.
Jeff Sharkey [Fri, 3 Feb 2012 23:47:39 +0000 (15:47 -0800)]
Tighten locking around data usage UID resolution.

Bug: 5965853
Change-Id: I92231ca938ddf320377c437c7379a03319c88aca

12 years agoam f215bfff: (-s ours) am 117bfe86: Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 23:07:00 +0000 (15:07 -0800)]
am f215bfff: (-s ours) am 117bfe86: Import translations. DO NOT MERGE

* commit 'f215bfff60aab5b9708b376eeedd033a8ad5418e':
  Import translations. DO NOT MERGE

12 years agoUnify shorthand for byte-based units.
Jeff Sharkey [Fri, 3 Feb 2012 22:50:33 +0000 (14:50 -0800)]
Unify shorthand for byte-based units.

Change-Id: I32f998b5ee1f5416c9cceafd124fd34b7433be42

12 years agoam 117bfe86: Import translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 21:54:46 +0000 (13:54 -0800)]
am 117bfe86: Import translations. DO NOT MERGE

* commit '117bfe86cd1b71b35bef4069a2bbd8452cd37a43':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 20:47:43 +0000 (12:47 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ice4cc1cd0d6b9ec2b7eca8cec68ff36aa8d49945

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 3 Feb 2012 20:46:38 +0000 (12:46 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic23ab755fb8351dfd34f1da3943b1cd8b475e923

12 years agoMerge "Update for NetworkPolicy refactoring."
Jeff Sharkey [Fri, 3 Feb 2012 00:26:46 +0000 (16:26 -0800)]
Merge "Update for NetworkPolicy refactoring."

12 years agoUpdate for NetworkPolicy refactoring.
Jeff Sharkey [Fri, 3 Feb 2012 00:12:00 +0000 (16:12 -0800)]
Update for NetworkPolicy refactoring.

Bug: 5262414
Change-Id: I17db862cc20a11f022dc2d02993ad52988618681

12 years agoMerge "New switch to enable/disable all developer settings."
Dianne Hackborn [Thu, 2 Feb 2012 23:17:32 +0000 (15:17 -0800)]
Merge "New switch to enable/disable all developer settings."

12 years agoNew switch to enable/disable all developer settings.
Dianne Hackborn [Thu, 2 Feb 2012 19:44:08 +0000 (11:44 -0800)]
New switch to enable/disable all developer settings.

Turning the switch on shows a dialog warning the user to not do this.

Turning the switch off resets all development settings.

Change-Id: I052b16e6d220fa60298799ace02e69a8a1a02ef2

12 years agoam 175f4154: (-s ours) resolved conflicts for merge of cbbfffca to ics-scoop-plus...
Eric Fischer [Thu, 2 Feb 2012 22:31:53 +0000 (14:31 -0800)]
am 175f4154: (-s ours) resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp

* commit '175f4154a6c0ff0917d56d67a1ad22d883eadda2':

12 years agoresolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp
Eric Fischer [Thu, 2 Feb 2012 22:07:34 +0000 (14:07 -0800)]
resolved conflicts for merge of cbbfffca to ics-scoop-plus-aosp

Change-Id: I2b80331b5c56eb46b88513bc841f54001405a5fc

12 years agoresolved conflicts for merge of 67a50f99 to ics-scoop
Eric Fischer [Thu, 2 Feb 2012 22:00:17 +0000 (14:00 -0800)]
resolved conflicts for merge of 67a50f99 to ics-scoop

Change-Id: I75009fa3089704e2b5045fda6716f733ae2b06fa

12 years agoam 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import translations. DO...
Eric Fischer [Thu, 2 Feb 2012 21:51:26 +0000 (13:51 -0800)]
am 201a77ea: (-s ours) am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE

* commit '201a77ea399527da0f69faf14cc26162909f43c7':
  Import translations. DO NOT MERGE

12 years agoam 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 21:49:08 +0000 (13:49 -0800)]
am 940f2a74: (-s ours) am 67a50f99: Import translations. DO NOT MERGE

* commit '940f2a7479eb68af290f631d227bc79dcf29a7c5':
  Import translations. DO NOT MERGE

12 years agoam 67a50f99: Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 21:47:17 +0000 (13:47 -0800)]
am 67a50f99: Import translations. DO NOT MERGE

* commit '67a50f99d80b76337541fb71f98025c0b144e5b5':
  Import translations. DO NOT MERGE

12 years agoam c61223ce: (-s ours) am cd92dd07: Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 21:27:51 +0000 (13:27 -0800)]
am c61223ce: (-s ours) am cd92dd07: Import translations. DO NOT MERGE

* commit 'c61223ce85bc0010130c4fcbc6b3a4aa0543192b':
  Import translations. DO NOT MERGE

12 years agoam cd92dd07: Import translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 21:26:26 +0000 (13:26 -0800)]
am cd92dd07: Import translations. DO NOT MERGE

* commit 'cd92dd07546a7fe410e3d0184cfafa3561b72050':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 20:56:05 +0000 (12:56 -0800)]
Import translations. DO NOT MERGE

Change-Id: I053bb60561334722b524e129a326ca016429d233

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 20:54:58 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE

Change-Id: I1e698fedf0d3e3f8ef30cca119303dbb4ca3f402

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 20:54:15 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE

Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a

12 years agoAdd Developer Option setting for Animator scaling.
Chet Haase [Wed, 1 Feb 2012 23:10:12 +0000 (15:10 -0800)]
Add Developer Option setting for Animator scaling.

This new setting allows users to set a scale factor for the
duration and startDelay of all Animator-based animations. This
setting is very similar to the Transition animation scale and
Window animation scale settings, except this one applies specifically
to Animator animations. The property is only accessible by users
through the Settings UI, not programmatically. The value applies
system-wide and is picked up per-process at the time of the first
ValueAnimator construction.

Change-Id: I4fd02b03e508495b39481bfc8904d8771d0fd4e1

12 years agoMerge "Reflect name change done in Phone package"
Daisuke Miyakawa [Wed, 1 Feb 2012 21:45:03 +0000 (13:45 -0800)]
Merge "Reflect name change done in Phone package"

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Wed, 1 Feb 2012 19:28:32 +0000 (11:28 -0800)]
Merge "Import translations. DO NOT MERGE"

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 1 Feb 2012 19:26:17 +0000 (11:26 -0800)]
Import translations. DO NOT MERGE

Change-Id: I579e0e00a4b2a250792f61b4b5bb3b27cad69c22

12 years agoam 84beed8a: am e3e777f7: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:06:17 +0000 (10:06 -0800)]
am 84beed8a: am e3e777f7: Reconcile with ics-mr1-release

* commit '84beed8a3214b71b9e29a3dbecd1af77caf6451c':

12 years agoam e3e777f7: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 18:01:15 +0000 (10:01 -0800)]
am e3e777f7: Reconcile with ics-mr1-release

* commit 'e3e777f7f208e6b88816225b5a1d33cfc59a2221':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 1 Feb 2012 16:50:41 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release

Change-Id: I298ee044e83510a9caa19f51e94567863861a8a0

12 years agoReflect name change done in Phone package
Daisuke Miyakawa [Wed, 1 Feb 2012 14:26:24 +0000 (06:26 -0800)]
Reflect name change done in Phone package

I5d152bf7c55fb2f7b changes Phone's "Settings" class to
"MobileNetworkSettings", so WirelessSettings also needs to point
the new class name.

Change-Id: I994c6278c0c1a7cb2ae33cdb94f32083ce146045

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 30 Jan 2012 23:46:07 +0000 (15:46 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ic52d8c1bb032fa8b2d527ec8d83732acebff183e

12 years agoam 43cbe3ff: am b6e57c1f: Merge "Do not set minimum value for mobile data limit dialo...
Jean-Baptiste Queru [Sat, 28 Jan 2012 05:09:22 +0000 (21:09 -0800)]
am 43cbe3ff: am b6e57c1f: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"

* commit '43cbe3ffb4f0777d8aa833355c523f4a1ff93818':
  Do not set minimum value for mobile data limit dialog higher than the actual set value

12 years agoam b6e57c1f: Merge "Do not set minimum value for mobile data limit dialog higher...
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:58:03 +0000 (13:58 -0800)]
am b6e57c1f: Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"

* commit 'b6e57c1f598fd9bf0f15c1e9eed238910e9fca1f':
  Do not set minimum value for mobile data limit dialog higher than the actual set value

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 27 Jan 2012 21:34:27 +0000 (13:34 -0800)]
Import translations. DO NOT MERGE

Change-Id: I8901f881b7d8876b5ac317cbdf2f0b57ebc26192

12 years agoMerge "Do not set minimum value for mobile data limit dialog higher than the actual...
Jean-Baptiste Queru [Fri, 27 Jan 2012 21:26:25 +0000 (13:26 -0800)]
Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value"

12 years agoRemove unused layout to fix the build.
Eric Fischer [Thu, 26 Jan 2012 23:29:32 +0000 (15:29 -0800)]
Remove unused layout to fix the build.

Change-Id: Ibc704c30305ac33f3478c3c5ded0ddb976e3c3ce

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 26 Jan 2012 22:41:27 +0000 (14:41 -0800)]
Import translations. DO NOT MERGE

Change-Id: I117ca72749afc39352db58b33b01a1fb52752c35

12 years agoDo not set minimum value for mobile data limit dialog higher than the actual set...
Shuhrat Dehkanov [Thu, 26 Jan 2012 14:04:02 +0000 (23:04 +0900)]
Do not set minimum value for mobile data limit dialog higher than the actual set value

When mobile data limit and warning limit are set to 0, pressing mobile data limit text
(0.0 GB) pops up mobile data limit dialog with minimum value 1. But the value set is 0,
which is causing the dialog to show its maximum value 2^31-1.

Change-Id: I79ed4df5fbf095a7e60bda640ff2ca26bcbd3cc4
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
12 years agoMerge "When auto-brightness is on, you can now adjust its brightness."
Dianne Hackborn [Mon, 23 Jan 2012 20:37:44 +0000 (12:37 -0800)]
Merge "When auto-brightness is on, you can now adjust its brightness."

12 years agoam 4fc84091: Reconcile with ics-mr1-release
The Android Open Source Project [Mon, 23 Jan 2012 18:41:35 +0000 (10:41 -0800)]
am 4fc84091: Reconcile with ics-mr1-release

* commit '4fc8409176ae3dcb7f255b3cdc8f9247ad08cc31':

12 years agoWhen auto-brightness is on, you can now adjust its brightness.
Dianne Hackborn [Sat, 21 Jan 2012 02:37:42 +0000 (18:37 -0800)]
When auto-brightness is on, you can now adjust its brightness.

Change-Id: Ie152def12cf7befd9c15a19f9975c207cbb5c541

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Mon, 23 Jan 2012 18:16:07 +0000 (10:16 -0800)]
Reconcile with ics-mr1-release

Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059

12 years agoam 1fea4322: am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFrag...
Justin Ho [Mon, 23 Jan 2012 17:18:28 +0000 (09:18 -0800)]
am 1fea4322: am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1

* commit '1fea43224ce3b84e248d9e49b8597fe58351db65':
  Fix a pseudo race condition in TtsEngineSettingsFragment.

12 years agoam cf3f7abb: am 999f23e2: Locale string comparisons must ignore case.
Narayan Kamath [Mon, 23 Jan 2012 17:18:25 +0000 (09:18 -0800)]
am cf3f7abb: am 999f23e2: Locale string comparisons must ignore case.

* commit 'cf3f7abbeb9a31e73ef41b3f6512ebb095ac9e90':
  Locale string comparisons must ignore case.

12 years agoMake the layout of the add word dialog easier to understand
Jean Chalard [Wed, 21 Dec 2011 09:13:09 +0000 (18:13 +0900)]
Make the layout of the add word dialog easier to understand

Change-Id: I1a71d5c95c142655219c7ab3ae4f67fa0b1f3d1a

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 21 Jan 2012 00:13:29 +0000 (16:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into...
Justin Ho [Fri, 20 Jan 2012 22:42:33 +0000 (14:42 -0800)]
am 43c9dcc1: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1

* commit '43c9dcc18e4e1137c59b847eadde7ae27302b08f':
  Fix a pseudo race condition in TtsEngineSettingsFragment.

12 years agoam 999f23e2: Locale string comparisons must ignore case.
Narayan Kamath [Fri, 20 Jan 2012 22:42:33 +0000 (14:42 -0800)]
am 999f23e2: Locale string comparisons must ignore case.

* commit '999f23e2c304bde3a5c27f7f882d4616f5abdf9e':
  Locale string comparisons must ignore case.

12 years agoMerge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:40:04 +0000 (14:40 -0800)]
Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1

12 years agoFix a pseudo race condition in TtsEngineSettingsFragment.
Narayan Kamath [Fri, 20 Jan 2012 17:52:02 +0000 (17:52 +0000)]
Fix a pseudo race condition in TtsEngineSettingsFragment.

The issue is that Fragment.setVoiceDataDetails can
be called before Fragment.getView. We guard against this
issue. No thread visibility issues here because both functions
are called on the UI thread.

bug:5884355
Change-Id: Iad91b91c58b04dcb9f34f6b5ff8752f2e8295423

12 years agoLocale string comparisons must ignore case.
Narayan Kamath [Fri, 20 Jan 2012 17:31:03 +0000 (17:31 +0000)]
Locale string comparisons must ignore case.

The spec does not specify case sensitivity and support
for 3 letter locales is currently poor.

bug:5885830
Change-Id: I1b8f582bd19b1b0aed220036c5f17904478dba46

12 years agoUse EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions
Tadashi G. Takaoka [Tue, 17 Jan 2012 05:59:27 +0000 (14:59 +0900)]
Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions

This change overrides Id40a164c.

Bug: 5850605
Change-Id: Id14aa2ebdf4087c88412ed82de75442785396b84

12 years agoMerge "AccessibilityService description not internationalized (Settings)."
Svetoslav Ganov [Thu, 12 Jan 2012 23:37:11 +0000 (15:37 -0800)]
Merge "AccessibilityService description not internationalized (Settings)."

12 years agoam d96abecc: am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."
Jean-Baptiste Queru [Thu, 12 Jan 2012 19:05:22 +0000 (11:05 -0800)]
am d96abecc: am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."

* commit 'd96abeccfd04de5a89599d2b041022bef9e58669':
  Observer for GPS is never added back.

12 years agoam 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."
Jean-Baptiste Queru [Thu, 12 Jan 2012 19:03:02 +0000 (11:03 -0800)]
am 02bc3ffe: am 1e78bd01: Merge "Observer for GPS is never added back."

* commit '02bc3ffe311f8cc5f9e9464ed0ecdd73ea576020':
  Observer for GPS is never added back.

12 years agoam 1e78bd01: Merge "Observer for GPS is never added back."
Jean-Baptiste Queru [Thu, 12 Jan 2012 19:00:21 +0000 (11:00 -0800)]
am 1e78bd01: Merge "Observer for GPS is never added back."

* commit '1e78bd01ca308eec6a08ad376a889240635d6c24':
  Observer for GPS is never added back.

12 years agoMerge "Observer for GPS is never added back."
Jean-Baptiste Queru [Thu, 12 Jan 2012 17:12:59 +0000 (09:12 -0800)]
Merge "Observer for GPS is never added back."

12 years agoam 3c246e65: Reconcile with ics-mr1-release
The Android Open Source Project [Thu, 12 Jan 2012 17:00:19 +0000 (09:00 -0800)]
am 3c246e65: Reconcile with ics-mr1-release

* commit '3c246e6574ff069f0bf454e1b3a5f7e316cb80eb':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Thu, 12 Jan 2012 16:56:52 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release

Change-Id: I4907309d47ab642baf4a2ca0c65b563400f52ee9

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 12 Jan 2012 00:29:50 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power...
Jim Miller [Tue, 10 Jan 2012 18:32:40 +0000 (10:32 -0800)]
am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

* commit '340990a2d29f566b83dc551e3c5f748c96bd99f2':
  Fix 4560303: Add setting to lock later when power button pressed

12 years agoam af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed...
Jim Miller [Tue, 10 Jan 2012 18:30:39 +0000 (10:30 -0800)]
am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

* commit 'af48709993faeb0d3665eb6a491aaec701e1ccd5':
  Fix 4560303: Add setting to lock later when power button pressed

12 years agoMerge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
Jim Miller [Tue, 10 Jan 2012 18:28:31 +0000 (10:28 -0800)]
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

12 years agoam 79ffc669: am aaff44c8: Don\'t allow wifi tethering when running monkeys.
Amith Yamasani [Tue, 10 Jan 2012 00:37:34 +0000 (16:37 -0800)]
am 79ffc669: am aaff44c8: Don\'t allow wifi tethering when running monkeys.

* commit '79ffc669173325e62fdb9f5a1f96fe2a5c3c230b':
  Don't allow wifi tethering when running monkeys.

12 years agoam aaff44c8: Don\'t allow wifi tethering when running monkeys.
Amith Yamasani [Tue, 10 Jan 2012 00:03:30 +0000 (16:03 -0800)]
am aaff44c8: Don\'t allow wifi tethering when running monkeys.

* commit 'aaff44c84f4e88184276064dff9e36eefde3ffcb':
  Don't allow wifi tethering when running monkeys.

12 years agoDon't allow wifi tethering when running monkeys.
Amith Yamasani [Mon, 9 Jan 2012 22:52:58 +0000 (14:52 -0800)]
Don't allow wifi tethering when running monkeys.

Bug: 5607825

Remove the wifi access point settings and wifi tethering checkbox when
monkeys are running.

Change-Id: I64b930ddb791013a08c178561fe29130f1f0e4b8

12 years agoFix 4560303: Add setting to lock later when power button pressed
Jim Miller [Sat, 7 Jan 2012 02:28:09 +0000 (18:28 -0800)]
Fix 4560303: Add setting to lock later when power button pressed

This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63

12 years agoam 5be1b1a2: Reconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 02:18:42 +0000 (18:18 -0800)]
am 5be1b1a2: Reconcile with ics-mr1-release

* commit '5be1b1a29507fe0aa09c30403b989a36077de0a7':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Sat, 7 Jan 2012 02:15:48 +0000 (18:15 -0800)]
Reconcile with ics-mr1-release

Change-Id: Ifa3965b3e29cc1a9fe89a24e78e83507a4b2880c

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 7 Jan 2012 00:32:49 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Increase char limit by 1 by request from translation."
Jean Chalard [Fri, 6 Jan 2012 02:12:37 +0000 (18:12 -0800)]
Merge "Increase char limit by 1 by request from translation."

12 years agoam dbc6b663: am da68fd46: Merge "Android OS battery usage overstated by screen on...
Todd Poynor [Thu, 5 Jan 2012 20:09:15 +0000 (12:09 -0800)]
am dbc6b663: am da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1

* commit 'dbc6b663079420fd9212d2062e2a3f1c25b27f24':
  Android OS battery usage overstated by screen on time

12 years agoam da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1
Todd Poynor [Thu, 5 Jan 2012 19:23:34 +0000 (11:23 -0800)]
am da68fd46: Merge "Android OS battery usage overstated by screen on time" into ics-mr1

* commit 'da68fd4620088c1cb3a51cd2064885cbcd1ac621':
  Android OS battery usage overstated by screen on time

12 years agoMerge "Android OS battery usage overstated by screen on time" into ics-mr1
Todd Poynor [Thu, 5 Jan 2012 19:21:08 +0000 (11:21 -0800)]
Merge "Android OS battery usage overstated by screen on time" into ics-mr1

12 years agoAndroid OS battery usage overstated by screen on time
Todd Poynor [Sat, 17 Dec 2011 00:02:51 +0000 (16:02 -0800)]
Android OS battery usage overstated by screen on time

Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com>
12 years agoCall setLanguage() when the TTS locale is changed in settings.
Narayan Kamath [Thu, 5 Jan 2012 15:14:04 +0000 (15:14 +0000)]
Call setLanguage() when the TTS locale is changed in settings.

This is required to fix the case where an app has instantiated
and is using a TextToSpeech instance, and the user switches to
settings and changes the language for that instance. If no
app was using TTS, then onCreate() would have be called when
TTS is used next, and the correct locale will be loaded.

bug:5823836
Change-Id: I62adf3f7f0f14b67450ba08b8743e0d31e615a7e

12 years agoIncrease char limit by 1 by request from translation.
Jean Chalard [Thu, 5 Jan 2012 10:16:49 +0000 (19:16 +0900)]
Increase char limit by 1 by request from translation.

This should still fit in the button.

Change-Id: I63c7c7d5298709e222e08fbbe2ff07638b19c7b1

12 years agoObserver for GPS is never added back.
Vladimir Baryshnikov [Wed, 4 Jan 2012 02:11:42 +0000 (18:11 -0800)]
Observer for GPS is never added back.

mSettingsObserver will be added only once  to mContentQueryMap on first start,
but if you bring activity back to top, it will not be added any more.

Signed-off-by: Vladimir Baryshnikov <vovkab@gmail.com>
12 years agoAccessibilityService description not internationalized (Settings).
Svetoslav Ganov [Wed, 4 Jan 2012 00:37:41 +0000 (16:37 -0800)]
AccessibilityService description not internationalized (Settings).

bug:5807616

Change-Id: Iab6cf000ce1029ab253d56cb8abe222ad3204e6d

12 years agoImport revised translations.
Eric Fischer [Thu, 29 Dec 2011 21:36:38 +0000 (13:36 -0800)]
Import revised translations.

Change-Id: I80538778f484d7bc37fdb78947d56802cc57286b

12 years agoVpnSettings: use USER_PRIVATE_KEY to list user certificates.
Chia-chi Yeh [Fri, 16 Dec 2011 22:59:03 +0000 (14:59 -0800)]
VpnSettings: use USER_PRIVATE_KEY to list user certificates.

Change-Id: Iba547331d00ddfe24dd5eda3a9ee70c9d17969d0

12 years agoMerge "Add debug support for P2P WPS"
Irfan Sheriff [Wed, 21 Dec 2011 17:26:51 +0000 (09:26 -0800)]
Merge "Add debug support for P2P WPS"

12 years agoam 2c49911b: Reconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Dec 2011 15:21:43 +0000 (07:21 -0800)]
am 2c49911b: Reconcile with ics-mr1-release

* commit '2c49911b21b275810ddcde0d2bcebf900099d02d':

12 years agoReconcile with ics-mr1-release
The Android Open Source Project [Wed, 21 Dec 2011 15:19:46 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release

Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49

12 years agoHave the add dialog maintain state across screen rotation
Jean Chalard [Fri, 16 Dec 2011 10:35:46 +0000 (19:35 +0900)]
Have the add dialog maintain state across screen rotation

Change-Id: I44d61018e0ed4de32b0a8da3ecba999831987956

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 21 Dec 2011 01:27:42 +0000 (17:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoam 9fb7b17c: am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available
Kazuhiro Ondo [Wed, 21 Dec 2011 00:47:27 +0000 (16:47 -0800)]
am 9fb7b17c: am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available

* commit '9fb7b17c465e6cf38681ef7742ee1a0a486c5b79':
  Don't enable SIM PIN Lock menu if SIM is not available

12 years agoam a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available
Kazuhiro Ondo [Wed, 21 Dec 2011 00:45:45 +0000 (16:45 -0800)]
am a98c353f: Don\'t enable SIM PIN Lock menu if SIM is not available

* commit 'a98c353f8b18607f0c2e9af26b91bf6ffbe8dc78':
  Don't enable SIM PIN Lock menu if SIM is not available

12 years agoDon't enable SIM PIN Lock menu if SIM is not available
Kazuhiro Ondo [Fri, 16 Dec 2011 21:34:13 +0000 (15:34 -0600)]
Don't enable SIM PIN Lock menu if SIM is not available

Bug: 5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7

12 years agoAdd debug support for P2P WPS
Irfan Sheriff [Tue, 20 Dec 2011 00:26:29 +0000 (16:26 -0800)]
Add debug support for P2P WPS

Use a system property to allow WPS selection for p2p
connection

Change-Id: I34af97eaa4c4d4ff2e7ed52ba8f9bfb21f7b1c45

12 years agoMerge "Change the "manage dictionaries" button to "less options""
Jean Chalard [Mon, 19 Dec 2011 09:27:14 +0000 (01:27 -0800)]
Merge "Change the "manage dictionaries" button to "less options""