Amith Yamasani
201896e983
am 79ffc669
: am aaff44c8
: Don\'t allow wifi tethering when running monkeys.
...
* commit '79ffc669173325e62fdb9f5a1f96fe2a5c3c230b':
Don't allow wifi tethering when running monkeys.
2012-01-09 16:37:34 -08:00
Amith Yamasani
79ffc66917
am aaff44c8
: Don\'t allow wifi tethering when running monkeys.
...
* commit 'aaff44c84f4e88184276064dff9e36eefde3ffcb':
Don't allow wifi tethering when running monkeys.
2012-01-09 16:03:30 -08:00
Amith Yamasani
aaff44c84f
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
2012-01-09 14:52:58 -08:00
The Android Open Source Project
83b9613395
am 5be1b1a2
: Reconcile with ics-mr1-release
...
* commit '5be1b1a29507fe0aa09c30403b989a36077de0a7':
2012-01-06 18:18:42 -08:00
The Android Open Source Project
5be1b1a295
Reconcile with ics-mr1-release
...
Change-Id: Ifa3965b3e29cc1a9fe89a24e78e83507a4b2880c
2012-01-06 18:15:48 -08:00
The Android Automerger
b8adf8c0dc
merge in ics-mr1-release history after reset to ics-mr1
2012-01-06 16:32:49 -08:00
Jean Chalard
38d658d01d
Merge "Increase char limit by 1 by request from translation."
2012-01-05 18:12:37 -08:00
Todd Poynor
6fec6e6770
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
2012-01-05 12:09:15 -08:00
Todd Poynor
dbc6b66307
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
2012-01-05 11:23:34 -08:00
Todd Poynor
da68fd4620
Merge "Android OS battery usage overstated by screen on time" into ics-mr1
2012-01-05 11:21:08 -08:00
Todd Poynor
e3b4dfae6f
Android OS battery usage overstated by screen on time
...
Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com >
2012-01-05 10:40:14 -08:00
Narayan Kamath
5a38df2648
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
2012-01-05 15:14:04 +00:00
Jean Chalard
a21db60c55
Increase char limit by 1 by request from translation.
...
This should still fit in the button.
Change-Id: I63c7c7d5298709e222e08fbbe2ff07638b19c7b1
2012-01-05 19:16:49 +09:00
Eric Fischer
c9ac3ca0f1
Import revised translations.
...
Change-Id: I80538778f484d7bc37fdb78947d56802cc57286b
2011-12-29 13:36:38 -08:00
Chia-chi Yeh
2340efc9a3
VpnSettings: use USER_PRIVATE_KEY to list user certificates.
...
Change-Id: Iba547331d00ddfe24dd5eda3a9ee70c9d17969d0
2011-12-27 13:21:57 -08:00
Irfan Sheriff
029dffbd5c
Merge "Add debug support for P2P WPS"
2011-12-21 09:26:51 -08:00
The Android Open Source Project
e6924090f1
am 2c49911b
: Reconcile with ics-mr1-release
...
* commit '2c49911b21b275810ddcde0d2bcebf900099d02d':
2011-12-21 07:21:43 -08:00
The Android Open Source Project
2c49911b21
Reconcile with ics-mr1-release
...
Change-Id: I35894bf1394fd007afa6cca910b2d9ae18ffdb49
2011-12-21 07:19:46 -08:00
Jean Chalard
124283e83b
Have the add dialog maintain state across screen rotation
...
Change-Id: I44d61018e0ed4de32b0a8da3ecba999831987956
2011-12-21 17:51:02 +09:00
The Android Automerger
52303c68fe
merge in ics-mr1-release history after reset to ics-mr1
2011-12-20 17:27:42 -08:00
Kazuhiro Ondo
9687a8d4a4
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
2011-12-20 16:47:27 -08:00
Kazuhiro Ondo
9fb7b17c46
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
2011-12-20 16:45:45 -08:00
Kazuhiro Ondo
a98c353f8b
Don't enable SIM PIN Lock menu if SIM is not available
...
Bug: 5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7
2011-12-20 14:30:15 -08:00
Irfan Sheriff
1e13143b3a
Add debug support for P2P WPS
...
Use a system property to allow WPS selection for p2p
connection
Change-Id: I34af97eaa4c4d4ff2e7ed52ba8f9bfb21f7b1c45
2011-12-19 16:43:29 -08:00
Jean Chalard
b4ba0ef786
Merge "Change the "manage dictionaries" button to "less options""
2011-12-19 01:27:14 -08:00
Todd Poynor
103b28073a
Android OS battery usage overstated by screen on time
...
Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com >
2011-12-16 16:15:13 -08:00
Jean Chalard
2c892d900b
Change the "manage dictionaries" button to "less options"
...
This is supposed to be easier to understand for users.
Change-Id: I144031941712ab15fb490619c288d533ce884ee9
2011-12-16 18:31:48 +09:00
Jean Chalard
99308097a1
Improve a translation comment
...
Change-Id: I5250a43ef2e54706c649dbb8ae80bfec9064e835
2011-12-16 16:47:12 +09:00
Jeff Sharkey
3038c52de4
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
2011-12-15 14:03:37 -08:00
The Android Open Source Project
459a531da4
am e8b0e7d3
: Reconcile with ics-mr1-release
...
* commit 'e8b0e7d3f4432284975d2fcfd80efa5d6f9b50ea':
2011-12-13 19:13:16 -08:00
The Android Open Source Project
e8b0e7d3f4
Reconcile with ics-mr1-release
...
Change-Id: I4d2578e9635a5585c499f7ffcd816c5cf6876b3f
2011-12-13 19:10:39 -08:00
The Android Automerger
c8c65a3b81
merge in ics-mr1-release history after reset to ics-mr1
2011-12-13 16:04:02 -08:00
Irfan Sheriff
f16669a601
Merge "Fix button visibility on connect"
2011-12-13 13:17:45 -08:00
Irfan Sheriff
0c0bd827a1
Fix button visibility on connect
...
Bug: 5750846
Change-Id: I1f31308a21f7f6876f12eb4f1ab45ecd1bc74092
2011-12-13 11:55:15 -08:00
Eric Fischer
f5bf1e7b68
am 91420083
: (-s ours) am 2bccd7f4
: Import revised translations. DO NOT MERGE
...
* commit '914200831f977e69e9eb98459403c19119ff3539':
Import revised translations. DO NOT MERGE
2011-12-13 10:21:09 -08:00
Eric Fischer
914200831f
am 2bccd7f4
: Import revised translations. DO NOT MERGE
...
* commit '2bccd7f4a7793fd78dd9c83e9fe613ea9e32513b':
Import revised translations. DO NOT MERGE
2011-12-13 10:18:52 -08:00
Eric Fischer
2bccd7f4a7
Import revised translations. DO NOT MERGE
...
Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe
2011-12-13 10:04:17 -08:00
The Android Open Source Project
c46de71ff4
am bb712edd
: Reconcile with ics-mr1-release
...
* commit 'bb712edde58d3b4069bb7f1f63895522ce651579':
2011-12-13 05:40:55 -08:00
The Android Open Source Project
bb712edde5
Reconcile with ics-mr1-release
...
Change-Id: I5dadecff177d51ca1193ed0a1c69d2ed09bdba60
2011-12-13 05:12:02 -08:00
Jean Chalard
ee4c1be260
Wording fix
...
Bug: 5306641
Change-Id: I11c404bd5d093149f044546363245ebb50e1b195
2011-12-13 20:45:57 +09:00
The Android Automerger
5652d2fcbc
merge in ics-mr1-release history after reset to ics-mr1
2011-12-12 22:09:28 -08:00
Eric Fischer
71af03eb0b
am efbb9c5d
: (-s ours) am 080691ed
: Import revised translations. DO NOT MERGE
...
* commit 'efbb9c5d9d56e7f9d62b32014d0361ed8a87990b':
Import revised translations. DO NOT MERGE
2011-12-12 15:39:21 -08:00
The Android Open Source Project
4bf888436d
am 71ca5e4c
: Reconcile with ics-mr1-release
...
* commit '71ca5e4c62283a4adc10a77356ed98c7fb7b8647':
2011-12-12 15:30:00 -08:00
Eric Fischer
efbb9c5d9d
am 080691ed
: Import revised translations. DO NOT MERGE
...
* commit '080691eda9be32e090ed9abba1cc6fa0047b51fd':
Import revised translations. DO NOT MERGE
2011-12-12 11:06:39 -08:00
Eric Fischer
080691eda9
Import revised translations. DO NOT MERGE
...
Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8
2011-12-12 11:00:08 -08:00
Meng Hu
11140b7d63
am 1d015e49
: am 3feacdf3
: Add Sprint update menu
...
* commit '1d015e49fcb3e15c8a64d1911c80b66e544fa25f':
Add Sprint update menu
2011-12-09 18:09:22 -08:00
Eric Fischer
4fba54a1ff
am 32c49f1a
: (-s ours) am d59d7cb0
: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '32c49f1ad7897fdf9dfc161b60f723355a93e6bb':
Import revised translations. DO NOT MERGE
2011-12-09 14:58:13 -08:00
The Android Open Source Project
7641eafb9c
am b7e62805
: am a961c06b
: Reconcile with ics-mr0-release
...
* commit 'b7e6280522341c57de9a81de6c541f114fab3e47':
2011-12-09 14:58:04 -08:00
The Android Open Source Project
39cb301dd9
am 018e0819
: Reconcile with ics-mr0-release ics-mr1-release
...
* commit '018e08197e1891d6985bf1261826de4cf60b18b1':
Fix NPE in advanced settings
2011-12-09 14:57:47 -08:00
The Android Open Source Project
71ca5e4c62
Reconcile with ics-mr1-release
...
Change-Id: Iaa494a9536a8a244bcb4050d78e7dc15dc8460f0
2011-12-09 07:11:40 -08:00