Commit Graph

1939 Commits

Author SHA1 Message Date
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
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
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
Jake Hamby
59091c08f4 Fix Bluetooth device name max length checking.
The Bluetooth device name has a maximum length of 248 bytes in UTF-8
encoding. The settings app previously limited the Bluetooth device
name entered by the user based on the number of characters, which is
incorrect when the name includes non-ASCII characters.

Created a new Utf8ByteLengthFilter class for BluetoothNamePreference
which counts UTF-8 bytes instead of Unicode characters, along with
unit tests.

We can move Utf8ByteLengthFilter into the framework in the future
if it would be useful elsewhere in the system or for applications.

Change-Id: I9debface09659f09d750f3bfe8ad6ddfd34c75c5
2010-09-22 16:04:50 -07:00
Bjorn Bringert
50c529220a Remove Search from the system Settings app DO NOT MERGE
The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.

The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).

Bug: 3017365

Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d
2010-09-21 13:56:16 -07:00
Bjorn Bringert
28580b4d9a Remove Search from the system Settings app DO NOT MERGE
The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.

The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).

This is a cherry-pick of change I08f3979cd8cdc0742efbc49be95aa59753c94c0d
to gingerbread.

Bug: 3017365
Change-Id: I55df30e3a0e1f307ad6f23900f54d3018efda59f
2010-09-21 10:51:45 +01:00
Dianne Hackborn
3a6bb47d9f Merge "Some improvements to the manage apps code:" into gingerbread 2010-09-20 17:06:58 -07:00
Dianne Hackborn
19df79af26 Some improvements to the manage apps code:
- Battery stats now aggregates bluetooth usage.
- Battery stats now uses new history iterator API.
- Battery stats chart is refectored to have the start of a
  common facility for building tick charts.
- Manage apps will now asynchronously wait for the apps list
  if it is taking >.25ms to build.

Change-Id: I568dd74beedf9a0a5a4c88ab567510cee9af8299
2010-09-20 17:06:17 -07:00
Bjorn Bringert
8fdaff05d1 am f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE
Merge commit 'f4d359d3c83d0e84319603ecc0f4dce120708612' into gingerbread

* commit 'f4d359d3c83d0e84319603ecc0f4dce120708612':
  Remove Search from the system Settings app DO NOT MERGE
2010-09-20 12:48:11 -07:00
Bjorn Bringert
f4d359d3c8 Remove Search from the system Settings app DO NOT MERGE
The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.

The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).

Bug: 3017365

Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d
2010-09-20 13:16:25 +01:00
Dianne Hackborn
cb818619c6 Update power usage UI to follow WIFI data changes.
Now handles WIFI start times being distributed across applications,
and collapses all work done in WIFI uid procs (esp that supplicant
thing) into the apps and overall WIFI category.

Change-Id: I341e5d63c45eeb0fb4121beed62474d947f9de11
2010-09-17 11:28:08 -07:00
Jaikumar Ganesh
213d579f98 Merge "Don't disconnect the same device before connecting." into gingerbread 2010-09-16 19:08:32 -07:00
Jaikumar Ganesh
84905edb63 Don't disconnect the same device before connecting.
We Pair: Remote device sends incoming connection, we get connected.
We get BondingState change and we connect.
Settings app disconnects connected profiles and then connects
without checking whether we are disconnecting the same device itself.

How was it working before ? Settings app used to queue all
commands. The disconnect followed by the connect would work
but unnecessarily disconnect and then connect.
With the queuing moved to framework, the connect fails
since the disconnect status has not been broadcasted.

Settings app shouldn't be disconnecting connected profiles.
That logic should reside in the framework. There is an open bug
and when the new APIs get implemented this will get removed.

Change-Id: I32a7fa36ff3c3321691c55071498f985dcdcfe8e
2010-09-16 18:56:30 -07:00
Dianne Hackborn
5c2a468481 Merge "Supercalifragilisticexpialidocious." into gingerbread 2010-09-14 12:31:20 -07:00
Dianne Hackborn
44178e2801 Supercalifragilisticexpialidocious.
Change-Id: Ifaece97c80b859cb455eab56230e076eca916f4a
2010-09-14 12:29:32 -07:00
Brad Fitzpatrick
c5c8dad0af Use new apply() instead of commit().
apply() starts an async disk write and doesn't have a return
value but is otherwise identical in observable effects.

Change-Id: I0f528607319d7eb5136bb11fce0b24d8741ccdf9
2010-09-14 09:26:51 -07:00
Jaikumar Ganesh
e714898a1a Merge "OutOfband pairing user dialog." into gingerbread 2010-09-13 11:43:01 -07:00
Chung-yih Wang
e5e4282af1 Enable the call setting when the VoIP feature is supported.
If the VoIP feature is included, the user need to be able to
configure the internet call settings even if it is in airplan mode.

Change-Id: I00d73fb0d9213162b8a9887cad0f800418446787
2010-09-11 10:24:46 +08:00
Eric Fischer
be45f642ca Import revised translations. DO NOT MERGE
Change-Id: I3a1f1eeb653d982ddc30c765a4a530aa48a364bf
2010-09-10 13:07:48 -07:00
Jaikumar Ganesh
a197eea307 OutOfband pairing user dialog.
Change-Id: I2f996067b983ad4678814040eb0773fa3968be13
2010-09-09 15:29:03 -07:00