Commit Graph

1642 Commits

Author SHA1 Message Date
Dianne Hackborn
3194754bfe am 3cda486c: am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Merge commit '3cda486cd23c3739d70681166979a3e0ea439ed3'

* commit '3cda486cd23c3739d70681166979a3e0ea439ed3':
  Fix android:allowClearUserData.
2010-09-30 22:14:41 -07:00
Svetoslav Ganov
cdd8e34b4f 3053971 Accessibility settings are not using Fragment APIs for dialogs. + 3053903 Pressing back while showing disable accessibility warning disables accessibility with no explicit user consent.
Change-Id: Iac7e7a96d8d9f37d1b39c29237b3e2c93381b39b
2010-09-30 20:19:07 -07:00
Dianne Hackborn
3cda486cd2 am 95d7a702: Merge "Fix android:allowClearUserData." into gingerbread
Merge commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2' into gingerbread-plus-aosp

* commit '95d7a702c3a36ffe79da099b717dc76d62a5bab2':
  Fix android:allowClearUserData.
2010-09-30 19:14:28 -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
Ken Wakasa
6d5b8951b1 Merge commit '47ad0cf3' into manualmerge
Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2
2010-09-30 11:54:31 +09:00
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
2010-09-29 16:09:42 -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
Nick Pelly
d83aaf28bc resolved conflicts for merge of 1ff9ad3f to master
Change-Id: I55137a241e13ec7da1d413cf9b7fd1c1fdd8c4d1
2010-09-29 12:10:35 -07:00
Ken Wakasa
47ad0cf3bc am d2c3f37f: Revise the Language & keyboard settings layout.
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp

* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
  Revise the Language & keyboard settings layout.
2010-09-29 09:58:01 -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
1ff9ad3fb4 am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread
Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp

* commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4':
  Add NFC checkbox to Settings app.
2010-09-28 22:34:42 -07: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
Jaikumar Ganesh
5809d33296 Update code for public Bluetooth APIs
Change-Id: Iab22e4ae3206f9085b2d53b8b18dc2abd6197226
2010-09-28 17:53:02 -07:00
Daisuke Miyakawa
097981df93 Merge "Fix misc problems happening in SetupWizard XL" 2010-09-28 16:06:44 -07:00
Daisuke Miyakawa
5d3c5cb9d0 Fix misc problems happening in SetupWizard XL
Change-Id: I6ba0813f36625de3d86543953972869657be50be
2010-09-28 16:04:08 -07:00
Chris Palmer
3e126474e9 am e2ab4597: am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread
Merge commit 'e2ab45972af13c30bb98848813313603670c8965'

* commit 'e2ab45972af13c30bb98848813313603670c8965':
  Improve the add-device-admin layout.
2010-09-28 13:58:03 -07:00
Daisuke Miyakawa
25af150c98 Remove OnStateListener and FragmentStarter.
Those interfaces aren't available any more, as we make Settings
inherit PreferenceActivity.

Bug: 3034757
Change-Id: I2f778a12168e3033291d6935bcc73637e7c78c0b
2010-09-28 12:12:11 -07:00
Amith Yamasani
379d9b05cf Fix launching of specific settings. 2010-09-28 11:46:49 -07:00
Chris Palmer
e2ab45972a am 88fdee27: Merge "Improve the add-device-admin layout." into gingerbread
Merge commit '88fdee27e97900173be2b1f4f86c25a7c381969c' into gingerbread-plus-aosp

* commit '88fdee27e97900173be2b1f4f86c25a7c381969c':
  Improve the add-device-admin layout.
2010-09-28 10:44:16 -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
6021a81381 am ca76166c: am 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
Merge commit 'ca76166c705dc78e5a186a9a41f324ba70f0a938'

* commit 'ca76166c705dc78e5a186a9a41f324ba70f0a938':
  Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
2010-09-27 21:03:10 -07:00
Winson Chung
ca76166c70 am 0adb8460: Merge "Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab" into gingerbread
Merge commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130' into gingerbread-plus-aosp

* commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130':
  Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
2010-09-27 15:09:08 -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
Amith Yamasani
2c0698162e am 38f331be: am f8093b33: Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread
Merge commit '38f331bece1e8c1c06ba51ee5a4a9ffc5615495b'

* commit '38f331bece1e8c1c06ba51ee5a4a9ffc5615495b':
  Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
2010-09-27 12:08:23 -07:00
Amith Yamasani
38f331bece am f8093b33: Merge "Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly." into gingerbread
Merge commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8' into gingerbread-plus-aosp

* commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8':
  Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
2010-09-27 11:52:39 -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
Daisuke Miyakawa
fe3b6bea01 Disable Status bar in SetupWizard XL.
Bug: 3005211
Change-Id: I468b7d45aceda8fbdc72f723c95c3818c8da20f5
2010-09-27 10:38:12 -07:00
Jake Hamby
989408cc70 am 68c6188b: am dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.
Merge commit '68c6188b91ca4034caeff7527487513c8cb012f8'

* commit '68c6188b91ca4034caeff7527487513c8cb012f8':
  Auto-connect Bluetooth device only when user initiates pairing.
2010-09-24 17:19:24 -07:00
Jake Hamby
68c6188b91 am dd79a33b: Auto-connect Bluetooth device only when user initiates pairing.
Merge commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8' into gingerbread-plus-aosp

* commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8':
  Auto-connect Bluetooth device only when user initiates pairing.
2010-09-24 17:16:37 -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
Daisuke Miyakawa
f5a71f8f63 Merge "Modify implementation around SetupWizard XL" 2010-09-24 11:09:21 -07:00
Daisuke Miyakawa
86eaa09aa4 Modify implementation around SetupWizard XL
Bug: 3005211
Change-Id: Ia01957725956d570370aceeab01750d77069001a
2010-09-24 11:06:30 -07:00
Amith Yamasani
6f62b675e5 Merge "Add a delete button to quickly delete a word in the user dictionary." 2010-09-23 17:16:10 -07:00
Amith Yamasani
e2ac72b4bc Add a delete button to quickly delete a word in the user dictionary. 2010-09-23 17:15:01 -07:00
Irfan Sheriff
e82a459392 Fix string usage for static IP UI
Static IP selection uses strings to match, use
ids instead.

Also, add CHAR LIMIT to the new strings added

Change-Id: I7d632cfd672527be3a9676634b9ac4ea6983b626
2010-09-23 14:44:01 -07:00
Irfan Sheriff
c001a38c75 Merge "Add UI for WPS" 2010-09-23 11:34:00 -07:00
Irfan Sheriff
b3024fa6a0 Add UI for WPS
The WPS available option is shown
for networks in scan results. Upon
selecting a network, the user has
the option of manually entering passwords
or choosing WPS for connection

Bug: 2277571
Change-Id: Ia12eb1742f1bf17128d51fa09e56dc4c3f067fa5
2010-09-23 07:18:07 -07:00
Jake Hamby
2695660674 am 5496db04: am 59091c08: Fix Bluetooth device name max length checking.
Merge commit '5496db047df21a44280c56984dbc296e2a1d7968'

* commit '5496db047df21a44280c56984dbc296e2a1d7968':
  Fix Bluetooth device name max length checking.
2010-09-22 17:05:30 -07:00
Jake Hamby
5496db047d am 59091c08: Fix Bluetooth device name max length checking.
Merge commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336' into gingerbread-plus-aosp

* commit '59091c08f4d0ad8f42013f58ce9bd23ac3306336':
  Fix Bluetooth device name max length checking.
2010-09-22 16:26:02 -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
Daisuke Miyakawa
4ad2f9b870 Let SetupWizard XL use Auto_TIME_ZONE
Bug: 2989496
Change-Id: I37719a70783fc0505598ef9aaad1792d4a0ca1af
2010-09-22 12:31:55 -07:00
Amith Yamasani
1bb6db5267 Add an Automatic Time Zone setting to Date & Time settings.
User can now enable auto-time but disable auto-timezone, especially
if we don't have NITZ time from the cell network (or wifi only)
and only have NTP time that gives us date and time.
2010-09-22 11:33:04 -07:00
Amith Yamasani
653abb13d8 Merge "Use PreferenceActivity and FragmentBreadCrumbs as they offer the same capabilities now." 2010-09-22 09:57:35 -07:00
Amith Yamasani
02cf71a591 Use PreferenceActivity and FragmentBreadCrumbs as they offer the same capabilities now.
Also fix: 2997438 and a similar bug in Tether Settings
Show + menu item for User Dictionary
2010-09-21 15:48:52 -07:00
Bjorn Bringert
e2b102de67 am 28580b4d: Remove Search from the system Settings app DO NOT MERGE
Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp

* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
  Remove Search from the system Settings app DO NOT MERGE
2010-09-21 03:05:25 -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
775dd0e18c am 7cad4e2c: am 3a6bb47d: Merge "Some improvements to the manage apps code:" into gingerbread
Merge commit '7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb'

* commit '7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb':
  Some improvements to the manage apps code:
2010-09-20 19:33:53 -07:00