Nick Pelly
792d43560b
Merge "Move NFC setting lower down the Setting's list." into gingerbread
2010-10-13 13:59:00 -07:00
Nick Pelly
72ce892dd9
Move NFC setting lower down the Setting's list.
...
Change-Id: I585d060a5b65df05d62c2bf156f5af76b3bf60e0
2010-10-13 12:22:37 -07:00
Jaikumar Ganesh
0340371297
Merge "DO NOT MERGE Add null check before disconnecting a device." into gingerbread
2010-10-13 11:09:35 -07:00
Jaikumar Ganesh
268d1f1e4b
DO NOT MERGE Add null check before disconnecting a device.
...
Bug: 3076404
Change-Id: I8ef140395503816296124a38e42ab9cc7e6f7159
2010-10-13 10:56:01 -07:00
Nick Pelly
083310d316
Update NFC settings description, and fix polarity.
...
Change-Id: I0d45652113617230e04536a7cc2ff148dd52595a
2010-10-12 21:22:54 -07:00
Jaikumar Ganesh
bdf1310707
Merge "Call disconnect / connect without checking the current status" into gingerbread
2010-10-12 19:04:01 -07:00
Nick Pelly
cd99332fee
Merge "Update settings app for new NFC API." into gingerbread
2010-10-12 18:58:46 -07:00
Jaikumar Ganesh
d3a460cce7
Call disconnect / connect without checking the current status
...
Its the job of the framework to check that, it already does that.
Framework will queue the commands. Earlier settings app used to queue
them.
Bug: 3076404
Change-Id: I664e1c4e2c0ef9c697066251ccca382ad12dfa2f
2010-10-12 16:19:40 -07:00
Nick Pelly
454d2ef051
Update settings app for new NFC API.
...
Change-Id: I2702e36d33591245fa86e00454348fc1a16f5cf8
Signed-off-by: Nick Pelly <npelly@google.com >
2010-10-12 13:07:06 -07:00
Kenny Root
737e91efb1
Merge "Don't show the sort menu for running process list" into gingerbread
2010-10-12 12:25:34 -07:00
Freeman Ng
1054e4890a
Merge "Hide "System tutorial" option if there's no IME tutorial bug: 3074212" into gingerbread
2010-10-12 11:06:46 -07:00
Kenny Root
673085af9e
Don't show the sort menu for running process list
...
You could bring up the menu and sort running processes by size or name
which would display the applications list at the same time the running
process list was being displayed. This happened because the
mApplicationsAdapter is used for the list of apps and is sortable, but
the running process list doesn't use the adapter.
Disable the menu when the running applications list is presented to
prevent this situation where two ListViews are visible.
Bug: 3084901
Change-Id: I5304cf7a1f426269ed4858e649729a35b9344717
2010-10-12 09:44:43 -07:00
Freeman Ng
2fc2ba11fe
Hide "System tutorial" option if there's no IME tutorial
...
bug: 3074212
Change-Id: I3653c23cd893114cec7822efb2d6acb08b7ba91e
2010-10-11 18:51:34 -07:00
Roy West
3018639200
With luck, final take on bug3076083, re back up settting
...
Change-Id: I236854b4f5d679bd1581d80baba2bd43af7313eb
2010-10-11 17:34:27 -07:00
Jake Hamby
4c0ff2c7b5
Merge "Fix bug where car dock sometimes doesn't connect." into gingerbread
2010-10-11 13:05:11 -07:00
Irfan Sheriff
566b5bb0f9
Improve password hint visibility
...
Bug: 3083095
Change-Id: I9fcf9d529c598ad75dd438ef0e7a896c6568cbab
2010-10-11 10:26:14 -07:00
Roy West
effdd53ff8
Fix bug3076083 re backup setting strings
...
Change-Id: I01939082d8179d28872a3367eb1691738595cb71
2010-10-09 09:40:23 -07:00
Roy West
82d2908b2e
do not merge
...
Change-Id: I97a2717227f18ab0c1a2688be65f444ef9d40521
2010-10-07 15:15:45 -07:00
Roy West
e3b0bda234
do not merge
...
Change-Id: I722fd2d58d6532b8fc241ada8e52a731b438f1b6
2010-10-07 08:34:41 -07:00
Eric Fischer
d86f58a93e
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-10-06 17:33:02 -07:00
Eric Fischer
5a2708d544
Import revised translations. DO NOT MERGE
...
Change-Id: I1ac2d76272f5d7e1d4dd8efff22a6bd249702dd3
2010-10-06 17:15:09 -07:00
Dianne Hackborn
b8f9c9cf7c
Add confirmation when stopping system service, as per rwest.
...
Change-Id: I1cca31a87d3acfc49ffb4562d922d4577c0b1cba
2010-10-06 17:09:54 -07:00
Dianne Hackborn
4b21f7cd94
Fix issue #3062691 : GPS enable bypass via com.android.settings.widget.SettingsAppWidgetProvider
...
Make the receiver private. Also fix to correctly update when sync
status changes.
Change-Id: I35481bf5b473196b00427da4df49aa76f691d38b
2010-10-06 14:28:23 -07:00
Eric Fischer
84c8c175c8
Import revised translations. DO NOT MERGE
...
Change-Id: I58d987d8ee9629e2d035a3bfddefedbe185daf8f
2010-10-06 11:56:08 -07:00
Dianne Hackborn
6dc1bf84cf
Manage apps "on SD card" now shows all apps that can go on SD card.
...
Change-Id: Icc413891b2b884bb1af340b4c09ab3935c8e51ca
2010-10-04 22:35:26 -07:00
Eric Fischer
340c5c4237
Separate the Settings activity name into two different strings.
...
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.
Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
2010-10-01 11:45:47 -07:00
Dianne Hackborn
95d7a702c3
Merge "Fix android:allowClearUserData." into gingerbread
2010-09-30 19:03:55 -07:00
Dianne Hackborn
2f144fc07d
Fix android:allowClearUserData.
...
Now respect this flag for system apps.
Change-Id: I496b0051a4998cb41b8c07fd0eb85e253de1eb97
2010-09-30 18:49:18 -07:00
Eric Fischer
f20931bc56
Merge "Import revised translations. DO NOT MERGE" into gingerbread
2010-09-30 15:48:14 -07:00
Ken Wakasa
2d6c0b0d77
Update strings for physical keyboard settings.
...
bug: 2954950
Change-Id: I023de6dbe191ca6525cec51147a916eb746fb3e7
2010-09-30 12:52:52 +09:00
Gilles Debunne
a63b08d9c8
New assets for power widget: gps, sync
...
Change-Id: Ie075549d7d0dd3193a53b75350340285d3ec80ad
2010-09-29 16:21:19 -07:00
Jake Hamby
582f1f84bb
Fix bug where car dock sometimes doesn't connect.
...
Attempt to connect to car/desk dock after pairing completes. This
fixes a bug where we didn't try to connect if we received the UUID
change intent before the bonding state change intent.
Change-Id: I7c12a4eb23d17d506e43a64bf2a3aa5241debcb9
2010-09-29 15:38:19 -07:00
Eric Fischer
3388aac10a
Import revised translations. DO NOT MERGE
...
Change-Id: I9ea6e351c10191e58ed1d1c2784022f3d099c84b
2010-09-29 14:36:34 -07:00
Gilles Debunne
98289826e6
Merge "New assets (wifi, bluetooth...)" into gingerbread
2010-09-29 12:18:13 -07:00
Gilles Debunne
5fb48a2539
New assets (wifi, bluetooth...)
...
Change-Id: I1b6c3a7049348aa63dddbacaf615b9ff5d630583
2010-09-29 12:10:37 -07:00
Eric Fischer
5698a75f15
Split strings with SD card references into variations.
...
Change-Id: I75263d57928817a211fbaf6ed45f828936f8d1be
2010-09-29 12:09:06 -07:00
Ken Wakasa
d2c3f37fa4
Revise the Language & keyboard settings layout.
...
bug: 2954950
Change-Id: Ie5815023654c3ee45f73fb6ec08266b11e7ff017
2010-09-29 23:52:02 +09:00
Nick Pelly
48ad5dfe31
Merge "Add NFC checkbox to Settings app." into gingerbread
2010-09-28 22:32:51 -07:00
Nick Pelly
ad50ba065d
Add NFC checkbox to Settings app.
...
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
2010-09-28 21:26:50 -07:00
Chris Palmer
88fdee27e9
Merge "Improve the add-device-admin layout." into gingerbread
2010-09-28 10:34:43 -07:00
Chris Palmer
51794a05ad
Improve the add-device-admin layout.
...
Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.
Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
2010-09-28 10:32:49 -07:00
Winson Chung
0adb8460bc
Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
2010-09-27 15:06:47 -07:00
Winson Chung
9a294912ad
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
...
Change-Id: I5c18b916b09979117e4b746f521a81ca554903b4
2010-09-27 14:34:48 -07:00
Eric Fischer
54e21852f2
Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread
2010-09-27 12:27:55 -07:00
Eric Fischer
b9e77aacd1
Trim unwanted whitespace from translations. DO NOT MERGE
...
Change-Id: I63529a6379e74b15cca02519445616225f5bd2f7
2010-09-27 12:21:49 -07:00
Amith Yamasani
f8093b330a
Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread
2010-09-27 11:20:52 -07:00
Amith Yamasani
740edeaa42
Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
...
Earlier refactoring seems to have messed it up. Added a position value to the state trackers.
Bug: 2980926
Change-Id: I31df4b1ae0b835d801d67747154594299498c4cf
2010-09-27 11:20:00 -07:00
Jean-Baptiste Queru
32d54b1936
reconcile froyo-release into gingerbread
...
Change-Id: I2386774732d4d0d0e46a5791dfc1b8cbeb60494b
2010-09-26 17:30:50 -07:00
Jake Hamby
dd79a33ba5
Auto-connect Bluetooth device only when user initiates pairing.
...
Fix bug 2271901: do not auto-connect to services on a BT device
when pairing was initiated by the device (e.g. for OPP file transfer).
Also corrected some typos and removed an unneeded lock object in
LocalBluetoothManager (synchronize on .class object instead, like
android.bluetooth.BluetoothDevice.getService() does).
Change-Id: I121105c6eee2658129f6094786754bbc7932d324
2010-09-24 14:23:26 -07:00
Eric Fischer
b2fa8719a4
Import revised translations. DO NOT MERGE
...
Change-Id: Iad9da8a6c0559c93c87a3b9f7e8a9258d677705b
2010-09-24 10:26:20 -07:00