OSDN Git Service
The Android Automerger [Thu, 2 Feb 2012 15:02:58 +0000 (07:02 -0800)]
merge in jb-release history after reset to master
Daisuke Miyakawa [Wed, 1 Feb 2012 21:45:03 +0000 (13:45 -0800)]
Merge "Reflect name change done in Phone package"
Eric Fischer [Wed, 1 Feb 2012 19:28:32 +0000 (11:28 -0800)]
Merge "Import 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
The Android Open Source Project [Wed, 1 Feb 2012 18:06:17 +0000 (10:06 -0800)]
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':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:41 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I298ee044e83510a9caa19f51e94567863861a8a0
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
The Android Automerger [Tue, 31 Jan 2012 15:02:27 +0000 (07:02 -0800)]
merge in jb-release history after reset to master
Eric Fischer [Mon, 30 Jan 2012 23:46:07 +0000 (15:46 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic52d8c1bb032fa8b2d527ec8d83732acebff183e
The Android Automerger [Mon, 30 Jan 2012 15:03:36 +0000 (07:03 -0800)]
merge in jb-release history after reset to master
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
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
Eric Fischer [Fri, 27 Jan 2012 21:34:27 +0000 (13:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8901f881b7d8876b5ac317cbdf2f0b57ebc26192
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"
Eric Fischer [Thu, 26 Jan 2012 23:29:32 +0000 (15:29 -0800)]
Remove unused layout to fix the build.
Change-Id: Ibc704c30305ac33f3478c3c5ded0ddb976e3c3ce
Eric Fischer [Thu, 26 Jan 2012 22:41:27 +0000 (14:41 -0800)]
Import translations. DO NOT MERGE
Change-Id: I117ca72749afc39352db58b33b01a1fb52752c35
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>
The Android Automerger [Tue, 24 Jan 2012 15:00:58 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
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."
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':
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
The Android Open Source Project [Mon, 23 Jan 2012 18:16:07 +0000 (10:16 -0800)]
Reconcile with ics-mr1-release
Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059
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.
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.
The Android Automerger [Mon, 23 Jan 2012 15:01:18 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
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
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
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.
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.
Justin Ho [Fri, 20 Jan 2012 22:40:04 +0000 (14:40 -0800)]
Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
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
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
The Android Automerger [Wed, 18 Jan 2012 15:00:50 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
The Android Automerger [Tue, 17 Jan 2012 15:01:31 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
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
Svetoslav Ganov [Thu, 12 Jan 2012 23:37:11 +0000 (15:37 -0800)]
Merge "AccessibilityService description not internationalized (Settings)."
The Android Automerger [Thu, 12 Jan 2012 22:14:03 +0000 (14:14 -0800)]
merge in ics-release history after reset to master
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.
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.
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.
Jean-Baptiste Queru [Thu, 12 Jan 2012 17:12:59 +0000 (09:12 -0800)]
Merge "Observer for GPS is never added back."
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':
The Android Open Source Project [Thu, 12 Jan 2012 16:56:52 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4907309d47ab642baf4a2ca0c65b563400f52ee9
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
The Android Automerger [Wed, 11 Jan 2012 18:16:39 +0000 (10:16 -0800)]
merge in ics-release history after reset to master
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
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
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
The Android Automerger [Tue, 10 Jan 2012 15:00:56 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
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.
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.
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
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
The Android Automerger [Mon, 9 Jan 2012 15:01:09 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
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':
The Android Open Source Project [Sat, 7 Jan 2012 02:15:48 +0000 (18:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ifa3965b3e29cc1a9fe89a24e78e83507a4b2880c
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
Jean Chalard [Fri, 6 Jan 2012 02:12:37 +0000 (18:12 -0800)]
Merge "Increase char limit by 1 by request from translation."
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
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
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
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>
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
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
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>
Svetoslav Ganov [Wed, 4 Jan 2012 00:37:41 +0000 (16:37 -0800)]
AccessibilityService description not internationalized (Settings).
bug:
5807616
Change-Id: Iab6cf000ce1029ab253d56cb8abe222ad3204e6d
The Android Automerger [Mon, 2 Jan 2012 15:00:48 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
Eric Fischer [Thu, 29 Dec 2011 21:36:38 +0000 (13:36 -0800)]
Import revised translations.
Change-Id: I80538778f484d7bc37fdb78947d56802cc57286b
The Android Automerger [Wed, 28 Dec 2011 14:59:59 +0000 (06:59 -0800)]
merge in ics-release history after reset to master
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
The Android Automerger [Thu, 22 Dec 2011 15:00:23 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
Irfan Sheriff [Wed, 21 Dec 2011 17:26:51 +0000 (09:26 -0800)]
Merge "Add debug support for P2P WPS"
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':
The Android Open Source Project [Wed, 21 Dec 2011 15:19:46 +0000 (07:19 -0800)]
Reconcile with ics-mr1-release
Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49
The Android Automerger [Wed, 21 Dec 2011 15:00:41 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
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
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
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
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
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
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
The Android Automerger [Mon, 19 Dec 2011 15:01:18 +0000 (07:01 -0800)]
merge in ics-release history after reset to master
Jean Chalard [Mon, 19 Dec 2011 09:27:14 +0000 (01:27 -0800)]
Merge "Change the "manage dictionaries" button to "less options""
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>
Jean Chalard [Fri, 16 Dec 2011 09:31:48 +0000 (18:31 +0900)]
Change the "manage dictionaries" button to "less options"
This is supposed to be easier to understand for users.
Change-Id: I144031941712ab15fb490619c288d533ce884ee9
Jean Chalard [Fri, 16 Dec 2011 07:47:12 +0000 (16:47 +0900)]
Improve a translation comment
Change-Id: I5250a43ef2e54706c649dbb8ae80bfec9064e835
Jeff Sharkey [Wed, 30 Nov 2011 23:37:51 +0000 (15:37 -0800)]
Restrict app data on metered networks.
Paired with framework change that no longer requires NetworkPolicy
to have limit when restricting apps.
Bug:
5571454
Change-Id: I2a5d8446a9278afb183e13d0f41f436ccb3bc9e8
The Android Automerger [Wed, 14 Dec 2011 15:00:53 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
The Android Open Source Project [Wed, 14 Dec 2011 03:13:16 +0000 (19:13 -0800)]
am
e8b0e7d3: Reconcile with ics-mr1-release
* commit '
e8b0e7d3f4432284975d2fcfd80efa5d6f9b50ea':
The Android Open Source Project [Wed, 14 Dec 2011 03:10:39 +0000 (19:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I4d2578e9635a5585c499f7ffcd816c5cf6876b3f
The Android Automerger [Wed, 14 Dec 2011 00:04:02 +0000 (16:04 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Irfan Sheriff [Tue, 13 Dec 2011 21:17:45 +0000 (13:17 -0800)]
Merge "Fix button visibility on connect"
Irfan Sheriff [Tue, 13 Dec 2011 19:55:15 +0000 (11:55 -0800)]
Fix button visibility on connect
Bug:
5750846
Change-Id: I1f31308a21f7f6876f12eb4f1ab45ecd1bc74092
Eric Fischer [Tue, 13 Dec 2011 18:21:09 +0000 (10:21 -0800)]
am
91420083: (-s ours) am
2bccd7f4: Import revised translations. DO NOT MERGE
* commit '
914200831f977e69e9eb98459403c19119ff3539':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Dec 2011 18:18:52 +0000 (10:18 -0800)]
am
2bccd7f4: Import revised translations. DO NOT MERGE
* commit '
2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Dec 2011 18:04:17 +0000 (10:04 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
The Android Automerger [Tue, 13 Dec 2011 15:00:57 +0000 (07:00 -0800)]
merge in ics-release history after reset to master
The Android Open Source Project [Tue, 13 Dec 2011 13:40:55 +0000 (05:40 -0800)]
am
bb712edd: Reconcile with ics-mr1-release
* commit '
bb712edde58d3b4069bb7f1f63895522ce651579':
The Android Open Source Project [Tue, 13 Dec 2011 13:12:02 +0000 (05:12 -0800)]
Reconcile with ics-mr1-release
Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60