Commit Graph

4739 Commits

Author SHA1 Message Date
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
Claudia de Veaux
780d72d6cb Fix for Bug 5110980 Settings: "VPN settings" renamed to "VPN". Changed two instances of "VPN settings" to "VPN".
Change-Id: I631ff361d32e0ee063e7fefde6a130e42e5f4dfd
2011-08-05 17:24:20 -07:00
Eric Fischer
d399a900c6 Import revised translations.
Change-Id: I5cec26c7b9e6dc27c347bfc830589eda1ad4f4d6
2011-08-05 17:07:14 -07:00
Jeff Sharkey
5c2d982f8e Merge "Data usage app icons and details, chart labels." 2011-08-05 00:14:43 -07:00
Jeff Sharkey
d39c6e4083 Data usage app icons and details, chart labels.
Add app icons into both summary list and details pane. Also show list
of all applications merged under a UID. Draw dates on chart axis, and
avoid flashing policy sweeps when switching networks in detail mode.

Bug: 5087283, 5038812
Change-Id: I1dcd03ca85b517f8726452af8a46b4be9b3d20f1
2011-08-04 21:20:03 -07:00
The Android Open Source Project
48a6de66bb Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I2e05e29384ce13de26514fd1e120c00cd0e39112
2011-08-04 18:46:20 -07:00
Eric Fischer
8caf395147 Merge "Import revised translations." 2011-08-04 16:13:54 -07:00
Eric Fischer
3985ce3517 Import revised translations.
Change-Id: Ifefc82b6cc09d33cf62244bf5e22c5185946d4e0
2011-08-04 16:13:03 -07:00
Jeff Sharkey
ce919e40c9 Merge "Data usage disabled state, smaller parcels." 2011-08-04 15:39:27 -07:00
Mike Cleron
f9391a0215 Merge "Save and restore wifi dialogs on screen rotation." 2011-08-04 15:30:57 -07:00
Eric Fischer
a3d8b5ae35 Merge "Remove unused string reference." 2011-08-04 14:26:41 -07:00
Amith Yamasani
44f972dacc Remove unused string reference.
Change-Id: I411a924c22c84d1a62e0e42df7429e4d869fe3ed
2011-08-04 14:21:06 -07:00
repo sync
76feb7f1c1 Use updated wifip2pmanager API
Change-Id: I03ef9a050b51a8895b89cd5daa93a094dc0b75a1
2011-08-04 14:05:37 -07:00
Amith Yamasani
3d13110d40 Save and restore wifi dialogs on screen rotation.
Bug: 4981732

Change-Id: If065f9af93af405d954fde044351e473d62ea91b
2011-08-04 13:15:30 -07:00
Chia-chi Yeh
540733aad6 Merge "VpnSettings: the field has been renamed." 2011-08-04 13:04:51 -07:00
Eric Fischer
12e5c36558 Merge "Restore deleted strings that are still in use." 2011-08-04 11:25:44 -07:00
Irfan Sheriff
711bb40cc3 Merge "Fix package path for p2p settings" 2011-08-04 10:29:30 -07:00
Irfan Sheriff
9ef53578b8 Fix package path for p2p settings
Split p2p change to avoid eclipse errors on master

Bug: 5002384
Change-Id: I446d4524b823d42c79daa24d43aa24012743e734
2011-08-03 23:21:33 -07:00