Eric Fischer
0e1dbb9421
Remove unused layout to fix the build.
...
Change-Id: Ibc704c30305ac33f3478c3c5ded0ddb976e3c3ce
2012-01-26 15:29:32 -08:00
Eric Fischer
b0fd2e6f09
Import translations. DO NOT MERGE
...
Change-Id: I117ca72749afc39352db58b33b01a1fb52752c35
2012-01-26 14:41:27 -08:00
Shuhrat Dehkanov
f9237f6e3c
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 >
2012-01-26 23:04:02 +09:00
Dianne Hackborn
93a2856e83
Merge "When auto-brightness is on, you can now adjust its brightness."
2012-01-23 12:37:44 -08:00
The Android Open Source Project
e8964d4b95
am 4fc84091
: Reconcile with ics-mr1-release
...
* commit '4fc8409176ae3dcb7f255b3cdc8f9247ad08cc31':
2012-01-23 10:41:35 -08:00
Dianne Hackborn
9907f6b274
When auto-brightness is on, you can now adjust its brightness.
...
Change-Id: Ie152def12cf7befd9c15a19f9975c207cbb5c541
2012-01-23 10:22:08 -08:00
The Android Open Source Project
4fc8409176
Reconcile with ics-mr1-release
...
Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059
2012-01-23 10:16:07 -08:00
Justin Ho
8a3703d909
am 1fea4322
: am 43c9dcc1
: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
...
* commit '1fea43224ce3b84e248d9e49b8597fe58351db65':
Fix a pseudo race condition in TtsEngineSettingsFragment.
2012-01-23 09:18:28 -08:00
Narayan Kamath
2580eb60a3
am cf3f7abb
: am 999f23e2
: Locale string comparisons must ignore case.
...
* commit 'cf3f7abbeb9a31e73ef41b3f6512ebb095ac9e90':
Locale string comparisons must ignore case.
2012-01-23 09:18:25 -08:00
Jean Chalard
75eba8cf56
Make the layout of the add word dialog easier to understand
...
Change-Id: I1a71d5c95c142655219c7ab3ae4f67fa0b1f3d1a
2012-01-23 16:14:37 +09:00
The Android Automerger
73ff4af39d
merge in ics-mr1-release history after reset to ics-mr1
2012-01-20 16:13:29 -08:00
Justin Ho
1fea43224c
am 43c9dcc1
: Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
...
* commit '43c9dcc18e4e1137c59b847eadde7ae27302b08f':
Fix a pseudo race condition in TtsEngineSettingsFragment.
2012-01-20 14:42:33 -08:00
Narayan Kamath
cf3f7abbeb
am 999f23e2
: Locale string comparisons must ignore case.
...
* commit '999f23e2c304bde3a5c27f7f882d4616f5abdf9e':
Locale string comparisons must ignore case.
2012-01-20 14:42:33 -08:00
Justin Ho
43c9dcc18e
Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
2012-01-20 14:40:04 -08:00
Narayan Kamath
2d8101bc8b
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
2012-01-20 17:52:02 +00:00
Narayan Kamath
999f23e2c3
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
2012-01-20 17:42:59 +00:00
Tadashi G. Takaoka
faee5f4bdf
Use EditorInfo.IME_FLAG_FORCE_ASCII instead of privateImeOptions
...
This change overrides Id40a164c.
Bug: 5850605
Change-Id: Id14aa2ebdf4087c88412ed82de75442785396b84
2012-01-17 15:04:00 +09:00
Svetoslav Ganov
4de315b8de
Merge "AccessibilityService description not internationalized (Settings)."
2012-01-12 15:37:11 -08:00
Jean-Baptiste Queru
99bf694ae8
am d96abecc
: am 02bc3ffe
: am 1e78bd01
: Merge "Observer for GPS is never added back."
...
* commit 'd96abeccfd04de5a89599d2b041022bef9e58669':
Observer for GPS is never added back.
2012-01-12 11:05:22 -08:00
Jean-Baptiste Queru
d96abeccfd
am 02bc3ffe
: am 1e78bd01
: Merge "Observer for GPS is never added back."
...
* commit '02bc3ffe311f8cc5f9e9464ed0ecdd73ea576020':
Observer for GPS is never added back.
2012-01-12 11:03:02 -08:00
Jean-Baptiste Queru
02bc3ffe31
am 1e78bd01
: Merge "Observer for GPS is never added back."
...
* commit '1e78bd01ca308eec6a08ad376a889240635d6c24':
Observer for GPS is never added back.
2012-01-12 11:00:21 -08:00
Jean-Baptiste Queru
1e78bd01ca
Merge "Observer for GPS is never added back."
2012-01-12 09:13:00 -08:00
The Android Open Source Project
d20d3686e1
am 3c246e65
: Reconcile with ics-mr1-release
...
* commit '3c246e6574ff069f0bf454e1b3a5f7e316cb80eb':
2012-01-12 09:00:19 -08:00
The Android Open Source Project
3c246e6574
Reconcile with ics-mr1-release
...
Change-Id: I4907309d47ab642baf4a2ca0c65b563400f52ee9
2012-01-12 08:56:52 -08:00
The Android Automerger
76b9d3ef47
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:29:50 -08:00
Jim Miller
325d1ab157
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
2012-01-10 10:32:40 -08:00
Jim Miller
340990a2d2
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
2012-01-10 10:30:39 -08:00
Jim Miller
af48709993
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
2012-01-10 10:28:31 -08:00
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
Jim Miller
071742d838
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
2012-01-09 14:25:04 -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
Vladimir Baryshnikov
aa5cb065e3
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 >
2012-01-03 18:11:42 -08:00
Svetoslav Ganov
63ad27860b
AccessibilityService description not internationalized (Settings).
...
bug:5807616
Change-Id: Iab6cf000ce1029ab253d56cb8abe222ad3204e6d
2012-01-03 17:04:29 -08: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