Commit Graph

5106 Commits

Author SHA1 Message Date
Eric Fischer
57f947342c Merge "Import revised translations." 2011-08-15 10:22:27 -07:00
Christopher Tate
2f6ea06a63 Merge "Move the desktop backup pw from "Backup and reset" to "Developer" settings" 2011-08-12 17:34:54 -07:00
Christopher Tate
fac0ea781f Move the desktop backup pw from "Backup and reset" to "Developer" settings
Addresses bug 5136161

Change-Id: Ia26258e0c8b0378184e4bac32a5da47de5da686f
2011-08-12 17:22:41 -07:00
Eric Fischer
b91a5578a0 Import revised translations.
Change-Id: I5792da0377dcc34efd14e0c23db5b85d5a6382ae
2011-08-12 17:21:28 -07:00
Amith Yamasani
60afe163b9 am 7e1c6cc0: am d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '7e1c6cc0fe3c3520d9d026c0dabbfb6e38113df9':
  Fix wrong behavior when changing pin code in settings
2011-08-12 16:26:54 -07:00
Amith Yamasani
40e3d1f7b0 am f14f96ef: am b3f6116e: am fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit 'f14f96efa831e9a81983869d8959e7cef6caba9a':
  Fix: Text is cut in Edit word edit box when adding word to dictionary
2011-08-12 16:26:49 -07:00
Amith Yamasani
493e992aca Merge "Potential fix for NPE in AccessibilitySettings." 2011-08-12 15:43:43 -07:00
Gilles Debunne
d57df23021 Merge "Format volume option restored" 2011-08-12 13:53:43 -07:00
Amith Yamasani
7e1c6cc0fe am d7d6c7ff: am 34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit 'd7d6c7ffad195e40db69c9ea0401f6717bcaeaf0':
  Fix wrong behavior when changing pin code in settings
2011-08-12 13:16:18 -07:00
Amith Yamasani
f14f96efa8 am b3f6116e: am fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit 'b3f6116e2bd8bfa1b23b724526badaa6b1602a12':
  Fix: Text is cut in Edit word edit box when adding word to dictionary
2011-08-12 13:16:17 -07:00
Amith Yamasani
1b52e0d024 Potential fix for NPE in AccessibilitySettings.
Bug: 5093363
Change-Id: I1e6b9bf0fd25b0298606035155bb87e6f64711c4
2011-08-12 11:14:51 -07:00
satok
16c3e74d72 Fix the title of the input method subtype enabler
Bug: 5097548
Change-Id: If01e13bd1ab7ac851b613450018f68f7f42f1e14
2011-08-12 12:46:27 +09:00
Amith Yamasani
d7d6c7ffad am 34d9b03f: Merge "Fix wrong behavior when changing pin code in settings"
* commit '34d9b03f1c6c5bf7d8caa74dc07124a6e67f89d5':
  Fix wrong behavior when changing pin code in settings
2011-08-11 12:44:55 -07:00
Amith Yamasani
34d9b03f1c Merge "Fix wrong behavior when changing pin code in settings" 2011-08-11 12:33:37 -07:00
Irfan Sheriff
a550058e1e Merge "Wifi state reset when disconnected" 2011-08-11 12:33:29 -07:00
Amith Yamasani
b3f6116e2b am fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary"
* commit 'fd73824d60ca92e297f354986cad525b947d05dd':
  Fix: Text is cut in Edit word edit box when adding word to dictionary
2011-08-11 12:31:47 -07:00
Amith Yamasani
fd73824d60 Merge "Fix: Text is cut in Edit word edit box when adding word to dictionary" 2011-08-11 12:17:03 -07:00
Amith Yamasani
f6cf49f63e Merge "Fix mute toggle behavior in Volume dialog." 2011-08-11 11:30:55 -07:00
Amith Yamasani
f63942e686 Fix mute toggle behavior in Volume dialog.
Adjust some padding and alignment.

Bug: 5128528

Fix highlighted entry when using Battery shortcut.

Bug: 5099767
Change-Id: I830dbb40b0b8a6448d33b2be2c36b9b80ff14bc4
2011-08-10 17:10:04 -07:00
Amith Yamasani
9f5cd3c273 Merge "Volumes panel shouldn't depend on Silent mode setting." 2011-08-10 14:21:03 -07:00
Claudia de Veaux
2d75f8294a Merge "Edit to label for regional date format to "Regional" from "Normal" Bug: 3471626" 2011-08-10 12:58:53 -07:00
Ken Wakasa
1c2b175d7a Prevent crashes when IME's settings activity is missing
bug: 5029444
Change-Id: I5c045123dbca2581f2e7d9f602e7511398b83504
2011-08-10 16:58:53 +09:00
Nick Pelly
1a787cf362 Merge "Add support for NFC in airplane mode." 2011-08-09 22:27:01 -07:00
Claudia de Veaux
805ae3726a Edit to label for regional date format to "Regional" from "Normal"
Bug: 3471626

Change-Id: Ife611299a4ce0ce26d94d6fdd15581102a2e869f
2011-08-09 18:23:26 -07:00
Justin Ho
c8a03c9a80 Merge "Updated Settings icons Removed More wifi settings icon Bug: 5084184" 2011-08-09 14:29:37 -07:00
Amith Yamasani
7f0d760ea5 Volumes panel shouldn't depend on Silent mode setting.
Otherwise it wont be possible to adjust alarm and music volumes.
Also fixes an inconsistent state when screen is turned off and on.

Bug: 5128528
Bug: 5128850

Change-Id: I3bfae44956de291b086905b9f43ca4ff5c7b9bbf
2011-08-09 14:25:30 -07:00
Justin Ho
5993f066c1 Updated Settings icons
Removed More wifi settings icon
Bug: 5084184

Change-Id: I4ed948bd24544d512179765eb917f3932f60751b
2011-08-09 14:17:17 -07:00
Jake Hamby
12294f893d Merge "Bluetooth : fix for unexpected discovery summary string changing" 2011-08-09 13:29:25 -07:00
Jake Hamby
5fa5be2f71 Merge "Bluetooth : fix for handling back key during pair dialog display" 2011-08-09 13:29:12 -07:00
Claudia de Veaux
ce477dbd83 Merge "Fix for 5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter." 2011-08-09 11:07:13 -07:00
Claudia de Veaux
74f9aba764 Fix for 5088341 Security settings: String changes related to renaming "Timeout" to "Automatically lock". Changed instance of "Timeout" to "Automatically lock", and summary text to be shorter.
Change-Id: I93b380b97ebfb4611fda9315ed8ea770ad3e8fb5
2011-08-09 09:56:16 -07:00
Nick Pelly
9894d4ade4 Add support for NFC in airplane mode.
Also update logic in Settings for new async NfcAdapter.enable() and disable().

Change-Id: Ie1e5407498ac7beb5a4e21daec0ada0e8ae9c388
2011-08-09 09:30:25 -07:00
Dianne Hackborn
1685ac22b6 Merge "Fix issue #5137681: et_source_broad_Android - GoogleJob..." 2011-08-08 20:14:59 -07:00
Chia-chi Yeh
48b797511b Merge "VpnSettings: fix bugs." 2011-08-08 17:45:41 -07:00
Dianne Hackborn
6b39720c30 Fix issue #5137681: et_source_broad_Android - GoogleJob...
...[ 91639 / - ]-GTT _request "0.85" clarification

Whatever that means.

To me it means, "do not translate."

Change-Id: Ieedd1251f3956f72ac7f22095cc82f839736e3bc
2011-08-08 17:23:27 -07:00
jhtop.kim
1ecee6c100 Bluetooth : fix for unexpected discovery summary string changing
- While Visibility timeout setting is never,
  the summary string "Visible to all nearby Bluetooth devices" is shown.
  but if rotating screen or unpairing, pairing actions make the summary
  be changed "Not visible to other Bluetooth devices" or
  "Only visible to paired devices"
- call handleModeChanged() to refresh summary state.

Change-Id: I4b324f2a9530e5e4ca4571f3dd47e8992bdae0cb
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-08-08 15:46:44 -07:00
jhtop.kim
aaf8ffff79 Bluetooth : fix for handling back key during pair dialog display
- Pressing back key when pairing dialog appears infront , device shows "Pairing..."
  if we don't have any bonded device in device list.
- when press back key will perform onCancel() operation.

Change-Id: Iacd654efad455f17a5c3bb09f822d9af5a7aed7d
Signed-off-by: jhtop.kim <jhtop.kim@samsung.com>
2011-08-08 15:21:12 -07:00
Eric Fischer
736102dd05 Merge "Import revised translations." 2011-08-08 15:04:44 -07:00
Chia-chi Yeh
6d4334be69 VpnSettings: fix bugs.
1. Support identifier in L2TP/IPSec PSK.
2. Fix profile validation for IPSec Hybrid RSA.
3. Fix crash when the user does not want to initialize keystore.

Change-Id: Id46dbbc84915dfb69f8bab6b540426e7614ab7c6
2011-08-08 14:35:25 -07:00
Claudia de Veaux
817ae6393a Merge "Fix for 5088373 Display settings: String changes related to renaming "Timeout" to "Sleep". Changed one instance of "Timeout" to "Sleep" and modified the setting description per bug." 2011-08-08 14:15:29 -07:00
Gilles Debunne
cba7d938bb Format volume option restored
It was removed independently of the state.
As a result an "Erase USB Storage" option is now available on the Nexus S.
I guess this is WAI.

Change-Id: I8765808924085c10ebf213da7f825db70017d0aa
2011-08-08 14:14:40 -07:00
Jake Hamby
bbd891d1f0 Merge "Fix multiple BT settings bugs." 2011-08-08 14:07:34 -07:00
Jim Miller
18e05d4313 Merge "Fix 5044847: Minor tweaks to SecuritySettings." 2011-08-08 13:21:31 -07:00
Claudia de Veaux
b6ba1f92f0 Fix for 5088373 Display settings: String changes related to renaming "Timeout" to "Sleep". Changed one instance of "Timeout" to "Sleep" and modified the setting description per bug.
Change-Id: Iab9084851b1fbf6bd1e8d3b730219f91232decb4
2011-08-08 12:22:18 -07:00
Gilles Debunne
c1eab91f07 Wifi state reset when disconnected
https://review.source.android.com/19086

Change-Id: Ie7367f2240b94569fed3120244f1cb268bb09206
2011-08-08 11:54:30 -07:00
Dianne Hackborn
14f6934fed Merge "Update to work with the activity manager taking over OOM settings." 2011-08-07 21:55:54 -07:00
Dianne Hackborn
430a3d3376 Update to work with the activity manager taking over OOM settings.
The values it needs are no longer in properties.

Also fix a few problems: bug with apps being left in the services
list, sorting of internal storage.

Change-Id: Ife9706e004931269c36a7bc37b9dbb016064c2e4
2011-08-07 16:29:05 -07:00
Jim Miller
63cf89a49a Fix 5044847: Minor tweaks to SecuritySettings.
Fix for 5044847 removes "Press menu for help" which is no longer used on any device.
Fix for 5092312 removes black background from pattern/pin/password settings.

Change-Id: I849ea0296aa9f0e9ace65086f9b154a961959f00
2011-08-07 16:09:50 -07:00
Claudia de Veaux
373bda0137 Merge "Fix for Bug 5110980 Settings: "VPN settings" renamed to "VPN". Changed two instances of "VPN settings" to "VPN"." 2011-08-05 18:24:20 -07:00
Dianne Hackborn
2826bc4ca5 Use new more efficient API for retrieving pss.
Change-Id: Ibcbcc397c2a7c19acd2de640528392df9bb780bb
2011-08-05 17:51:48 -07:00