Commit Graph

5377 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
60ec22d1bd Merge "Settings: Fixed German translation for turning WLAN/Bluetooth on" 2012-06-13 17:05:38 -07:00
Jean-Baptiste Queru
051f46d798 Merge "Unregister ContentObserver in InputMethodAndLanguageSettings class" 2012-06-12 13:50:36 -07:00
Shuhrat Dehkanov
9bcc607049 Unregister ContentObserver in InputMethodAndLanguageSettings class
A content observer (SettingsObserver) is registered when
InputMethodAndLanguageSettings is created, but it is never unregistered.

Added resume() and pause() methods to SettingsObserver inner class
to register/unregister the content observer when InputMethodAndLanguageSettings
is resumed/paused.

Change-Id: I6d4cc2625a5fd8435967d930f46e8fe86eda4714
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
2012-06-13 03:20:38 +09:00
Jean-Baptiste Queru
c56b01460e Merge "Fixing pin_too_short text" 2012-06-11 11:22:45 -07:00
Youness Ghanim
532b11b481 Fixing pin_too_short text
Made lockpassword_pin_too_short in sync with other pin
text lables.

Change-Id: Ia9295f7b36b29a3b4370e04461446a1428fc2ee2
2012-06-11 13:45:20 +02:00
Jean-Baptiste Queru
5a0b3230e2 Merge "Add account type check for invisible sync adapters." 2012-06-08 08:02:36 -07:00
Zhenguo Fu
193821e6e8 Add account type check for invisible sync adapters.
The invisible sync adapters array is modified to
store the sync adapters instead of their authorities,
so that "Sync now" function will only synchronize
those with the same account type as the current
account.

Change-Id: If9b0b32db9828d8671f57a0d7a2f64712a7ebabf
2012-06-07 14:42:28 +02:00
Marcus Bauer
5b332e86ba Settings: Fixed German translation for turning WLAN/Bluetooth on
Prior to this patch, the question "WLAN aktivieren?" would show
after you turned it on, and while it is loading; this patch
merely addresses this issue and changes it to "WLAN wird aktiviert",
which is consistent with the message showing up when turning it off.

Likewise for turning Bluetooth on.

Change-Id: Ic91143836a85751c39839daae720ac03b174bfde
2012-05-27 10:58:31 +02:00
Amith Yamasani
8ad7abbcf6 Merge "Corrected return value for updatePreferenceToSpecificActivityOrRemove method" 2012-05-24 09:48:21 -07:00
Jean-Baptiste Queru
1a47dff3ce Merge "Remove title bar background drawable from running app detail view" 2012-05-22 07:48:41 -07:00
Jean-Baptiste Queru
c0653a1230 Merge "Expandable NumberPicker width in bytesPicker dialog" 2012-05-21 11:37:30 -07:00
Wink Saville
69801b36a1 Merge "RadioInfo: Update the network type listing" 2012-05-03 14:20:01 -07:00
Ricardo Cerqueira
32310ee560 RadioInfo: Update the network type listing
The dropdown for the preferred type in the INFO menu is outdated.
ril.h and RILConstants now go up to type 11, due to the addition of
the LTE combinations.
If a device has one of these new types set up as the default, going
into this menu causes a crash for com.android.phone, since it attempts
to use array position "type" without verifying if it is that long.

Change-Id: I0bf4bb70e21aef79f22e7258c8154e3ec569a215
2012-05-03 19:12:13 +01:00
Amith Yamasani
b3c17c570a Merge "Removing static reference from sUnknown" 2012-05-02 14:12:36 -07:00
Jean-Baptiste Queru
299ed15213 Merge "Wifi: Update message when scan result is empty" 2012-05-01 12:40:13 -07:00
Jean-Baptiste Queru
7bb1c807bf Merge "Settings: PT-BR translation fix" 2012-05-01 05:52:41 -07:00
Afzal
dde0140971 Expandable NumberPicker width in bytesPicker dialog
Issue: The bytesPicker NumberPicker width was set to 48dip,
thus it couldn't accomodate more than 5 digits.
Solution: Set the NumberPicker layout_width to wrap_content and minWidth to 48dip.

Change-Id: Id2887cc5d48a94fa108f2ebe06f982cf2c1314dc
2012-04-26 04:05:03 -04:00
Shuhrat Dehkanov
7dc567af05 Corrected return value for updatePreferenceToSpecificActivityOrRemove method
Returned value should be false if preference is removed or was already deleted/missing.

Change-Id: I2a48bd8e0f5a82b76b60b2d11fac2305f0e27eed
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
2012-04-23 01:59:56 +09:00
Emerson Pinter
74047554a5 Settings: PT-BR translation fix
Fix the Display string in Settings menu.

Change-Id: I13c70eef7f64c4cd64e187c82da3be31b3be0f6c
Signed-off-by: Emerson Pinter <dev@pinter.com.br>
2012-04-13 12:08:15 -03:00
Eddie Ringle
70e4a652f8 Remove title bar background drawable from running app detail view
The use of this drawable made the view look out of place on the new Holo theme,
so removing it makes things look a bit more consistent.

Change-Id: Id12ad9c7d13b7a9813f656b0a3e4ac51fcc988cd
Signed-off-by: Eddie Ringle <eddie.ringle@gmail.com>
2012-04-12 18:24:52 -04:00
Vishal Mahaveer
df7627d0dd Wifi: Update message when scan result is empty
Handle case when Wi-Fi scan result is empty

Change-Id: Ib09f030dbc0b71055a7aacf0848b97bd6c33af70
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-04-09 11:40:40 -05:00
Jason Chen
b0362b1bb0 am d5f7e6cd: [DO NOT MERGE] Revert "Update string in Settings"
* commit 'd5f7e6cd6b5a1273ed4e5e34f040dc6087017ed9':
  [DO NOT MERGE] Revert "Update string in Settings"
2012-03-16 17:26:29 -07:00
Jason Chen
d5f7e6cd6b [DO NOT MERGE] Revert "Update string in Settings"
This reverts commit 23d0b5287a.
2012-03-16 16:18:51 -07:00
Jason Chen
dd6c0d61d7 am 23d0b528: Update string in Settings
* commit '23d0b5287a527379d7c52a971b7dfa8c1fc769e2':
  Update string in Settings
2012-03-16 14:16:17 -07:00
Jason Chen
23d0b5287a Update string in Settings
Bug: 6183254

Change-Id: Ifba3f97fa318babdd1eb4801cd9a0691adbe3128
2012-03-16 11:31:19 -07:00
Irfan Sheriff
c4bf8cd955 am 2f76aaaf: Merge "Enable EAP-pwd configuration in WiFi Settings."
* commit '2f76aaaf0105add942334ef3574e7378ee8a6097':
  Enable EAP-pwd configuration in WiFi Settings.
2012-03-01 22:48:42 -08:00
Irfan Sheriff
2f76aaaf01 Merge "Enable EAP-pwd configuration in WiFi Settings." 2012-03-01 16:47:19 -08:00
The Android Open Source Project
79ec613a66 Reconcile with ics-mr1-release
Change-Id: Icb875d44d67d0d2c6befa309453a464668289ccd
2012-03-01 10:12:39 -08:00
The Android Automerger
815b2f3467 merge in ics-mr1-release history after reset to ics-mr1 2012-02-28 15:15:44 -08:00
Amith Yamasani
e5cb62f5f4 am 93724840: Don\'t crash if there\'s no bluetooth functionality (such as in an emulator) do not merge.
* commit '9372484065993cfdb9a48ddecc52d2ed911e8ce1':
  Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
2012-02-28 10:13:28 -08:00
Amith Yamasani
9372484065 Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.
Bug: 6079494

(cherry picked from commit 5fb53f36cb)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9
2012-02-28 09:58:45 -08:00
Partha N
ba7ee527d8 Enable EAP-pwd configuration in WiFi Settings.
EAP-pwd (RFC 5931) is an EAP method that uses a shared password
for authentication. It has the simplicity of setup as WPA2-PSK
(no certificates), but provides strong authenticaiton like 802.1x.

Modified the Settings screen so that the only visible fields
when choosing EAP-pwd are 'identity' and 'password'.

Change-Id: I9365d873b43c416ddfa4cae47b7419d902c212a7
Signed-off-by: Partha N <parthan@gmail.com>
2012-02-26 22:26:55 -08:00
The Android Open Source Project
7b27630217 Reconcile with ics-mr1-release
Change-Id: Ibe6997bc5295b3deb615e8f51f73a1639d0f3235
2012-02-16 10:03:02 -08:00
The Android Automerger
7ca9dcbdff merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:17:08 -08:00
Eric Fischer
ecd9c570f7 am 78ef5443: Import translations. DO NOT MERGE
* commit '78ef5443a66ee01d75d89227bfd078706184662c':
  Import translations. DO NOT MERGE
2012-02-10 10:12:35 -08:00
Eric Fischer
78ef5443a6 Import translations. DO NOT MERGE
Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382
2012-02-08 19:08:43 -08:00
Eric Fischer
940f2a7479 am 67a50f99: Import translations. DO NOT MERGE
* commit '67a50f99d80b76337541fb71f98025c0b144e5b5':
  Import translations. DO NOT MERGE
2012-02-02 13:47:17 -08:00
Eric Fischer
67a50f99d8 Import translations. DO NOT MERGE
Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a
2012-02-02 12:54:15 -08:00
Jean-Baptiste Queru
43cbe3ffb4 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
2012-01-27 13:58:03 -08:00
Jean-Baptiste Queru
b6e57c1f59 Merge "Do not set minimum value for mobile data limit dialog higher than the actual set value" 2012-01-27 13:26:25 -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
Gustavo Waku
41e70e67fa Removing static reference from sUnknown
Removing static reference from field sUnknown
allows framework to handle properly resources.
Current implementation holds an instance of
sUnknown, final user sees "Unknown" field on the
IMEI SV [ Menu > About > Status ] even if the
language set is other than english.

Change-Id: I6345f578577e631782c0598bfa44ff4de04c6261
2012-01-25 00:32:32 -02:00
The Android Open Source Project
4fc8409176 Reconcile with ics-mr1-release
Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059
2012-01-23 10:16:07 -08: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
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