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
The Android Automerger
27144d9f1e
merge in ics-release history after reset to master
2011-08-08 08:23:04 -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
The Android Automerger
6d3471af2e
merge in ics-release history after reset to master
2011-08-05 11:17:49 -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
The Android Automerger
c3cb6b7e92
merge in ics-release history after reset to master
2011-08-04 06:52:01 -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
Adam Powell
716b05b860
Give Settings back its split action bars
...
Change-Id: I0b8572fee84833a8495125643542380d7f90aa3e
2011-08-03 20:12:41 -07:00
Jake Hamby
79be0b3e6b
Fix multiple BT settings bugs.
...
- Change Bluetooth profiles screen to match ICS wireframes
- Remove BluetoothProfilePreference.java (no longer used)
- Remove "Pair with this device" summary below every unpaired device
- Remove "Paired but not connected" summary below unconnected paired devices
- Fix auto connection after pairing (reuse existing CachedBluetoothDevice)
- Add "Connected (no phone/media)" summaries based on ICS wireframes
- Fix visibility timeout strings.
- Fix crash when starting Bluetooth from Settings shortcut widget.
Bug: 5064139
Bug: 5064324
Bug: 5080404
Bug: 5093513
Bug: 5104485
Change-Id: Ie87103e183ce414c86cb1831a38ef0178b1b1292
2011-08-03 17:55:27 -07:00
Jeff Sharkey
1ae43f922a
Data usage disabled state, smaller parcels.
...
Hide policy controls when low-level bandwidth controls are disabled
or when radio is disabled. Only request byte counters from history
to reduce parcel size by about 60%.
Bug: 5096903, 5096752
Change-Id: I407b7a01bf60b7105994052cc6e3262054f51184
2011-08-03 17:20:45 -07:00
Chia-chi Yeh
d5a5de4de6
VpnSettings: the field has been renamed.
...
Change-Id: I1e234e96d0fa4af6f03a5b902073460acffd8e28
2011-08-03 15:44:08 -07:00
Amith Yamasani
0c8ff2b3ce
Merge "Sound settings screen and volumes dialog reconfiguration."
2011-08-03 14:51:28 -07:00
Amith Yamasani
ba1f0ae33f
Merge "Center button text in the InstalledAppDetails screens."
2011-08-03 13:54:56 -07:00
Amith Yamasani
b764f63c30
Center button text in the InstalledAppDetails screens.
...
Bug: 5098457
Change-Id: I2ae0083c9547d17324ebbd667eb85f58da88ec15
2011-08-03 12:08:23 -07:00
The Android Automerger
bdc8735618
merge in ics-release history after reset to master
2011-08-03 06:36:18 -07:00
Amith Yamasani
823bf0c155
Sound settings screen and volumes dialog reconfiguration.
...
Removed the "Notifications use ring volume" checkbox.
Show the current ringtones in the summary area.
Bug: 5032308
Change-Id: I17e63f32c1775dd2097904df1aa6aaf699bd8ae2
2011-08-02 18:59:43 -07:00
Adam Powell
f3b46cae51
Merge "Follow framework API changes"
2011-08-02 18:45:24 -07:00
Christopher Tate
bc955aeb13
Merge "Tweak font-size summary display"
2011-08-02 17:43:21 -07:00
Christopher Tate
88138f164f
Merge "Always put 'USB COMPUTER CONNECTION' into the overflow menu"
2011-08-02 17:42:57 -07:00
Alan Viverette
be6a64e359
Updated Accessibility tutorial strings.
...
Change-Id: Ibdd00cad7d6902020f1dbcded42ba391fc31678e
2011-08-02 17:09:25 -07:00
Dianne Hackborn
2e02d20704
Merge "Clear bitmaps from canvses after done drawing to them."
2011-08-02 17:05:52 -07:00
Dianne Hackborn
419740de68
Clear bitmaps from canvses after done drawing to them.
...
Change-Id: I902edf771c66485269289aeeb4d64c56fe899906
2011-08-02 17:01:30 -07:00
Dianne Hackborn
f2e4c67ad8
Merge "New development setting for ANRs."
2011-08-02 16:58:30 -07:00
Adam Powell
66546c7077
Follow framework API changes
...
Change-Id: Ieb06a35a65d70d7b65f801814a0a46c9acc80445
2011-08-02 16:54:20 -07:00
Eric Fischer
0f7b72f846
Restore deleted strings that are still in use.
...
Change-Id: I491bbe4576c6995b082d197f80b3a6b54443bd84
2011-08-02 16:46:51 -07:00
Christopher Tate
75d8d31b4c
Tweak font-size summary display
...
Now the setting title & summary are presented as e.g.:
Font size
Extremely large
Bug 5022057
Change-Id: I28e0d84705b0c9190431ed5419866ebd66d68dc7
2011-08-02 16:43:47 -07:00