Commit Graph

15016 Commits

Author SHA1 Message Date
Hung-ying Tyan
11dd7d5fb3 Fix the state machine for CONNECTING/DISCONNECTING states. 2009-08-27 11:03:46 +08:00
Android (Google) Code Review
cfb4089b37 Merge change 22611 into eclair
* changes:
  Hide the "Enable Assisted GPS" checkbox in security & location settings.
2009-08-25 11:55:20 -07:00
Mike Lockwood
7f894124f4 Hide the "Enable Assisted GPS" checkbox in security & location settings.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-25 11:34:56 -07:00
Amith Yamasani
e13209ab42 Remember dialog state for notification volume.
Restore the original volume if user hasn't okayed the new volume.
2009-08-24 17:55:56 -07:00
Amith Yamasani
a0dc346f4c Remove summaries from top-level of settings. 2009-08-24 12:52:42 -07:00
Android (Google) Code Review
244080159b Merge change 22303 into eclair
* changes:
  Show error messages when Authentication fails.
2009-08-24 10:53:27 -07:00
Chung-yih Wang
a97d794825 Support WPA2-EAP configuration.
Add the support for configuring WPA2-EAP APs by grouping them as the WPA-EAP in security mode.
2009-08-24 10:32:13 +08:00
Android (Google) Code Review
ad149f7e8c Merge change 22339 into eclair
* changes:
  Fixing bug 2064923. This is a fix to make sure that the accessibility manager does not start any of the accessibility services when it is disabled.
2009-08-21 15:22:51 -07:00
Charles Chen
d218df2787 Fixing bug 2064923.
This is a fix to make sure that the accessibility manager does not start
any of the accessibility services when it is disabled.
2009-08-21 15:14:25 -07:00
Jaikumar Ganesh
cb6a3b3d9e Show error messages when Authentication fails.
Call Canceled when user presses "Don't Pair".
Thus for Authentication Failed cases we can show the message to the
user.
2009-08-21 11:55:29 -07:00
Android (Google) Code Review
02c5fabcfd Merge change 22064 into eclair
* changes:
  Add type to filter option to list view Make ListAdapter implement Filterable. Add new implementation for Filter to search based on prefixes. When creating the list include the filter option to create actual list entries. Since Filter.performFiltering is done on a work thread, introduce a new lock and a HashMap of packages matching a prefix which is then used to create a filtered list of applications. Also separte out modifying mAppLocalList which is the basis for list and the dependent mFilterMap used by Filter.performFiltering method to Locked methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
2009-08-21 11:48:50 -07:00
Suchi Amalapurapu
c0b23d3f0b Add type to filter option to list view
Make ListAdapter implement Filterable. Add new implementation for Filter
to search based on prefixes.
When creating the list include the filter option to create actual list entries.
Since Filter.performFiltering is done on a work thread, introduce a new lock
and a HashMap of packages matching a prefix which is then used to create a filtered list of applications.
Also separte out modifying mAppLocalList which is the basis for list and
the dependent mFilterMap used by Filter.performFiltering method to Locked
methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
2009-08-21 11:47:57 -07:00
Android (Google) Code Review
9182721336 Merge change 22130 into eclair
* changes:
  Call the correct function for canceling a pairing request.
2009-08-20 15:10:49 -07:00
Jaikumar Ganesh
8c08bcd2ab Call the correct function for canceling a pairing request. 2009-08-20 15:02:41 -07:00
Yue Lixin
a41e2f94b7 Implement Bluetooth device picker
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
2009-08-19 20:45:18 -07:00
Android (Google) Code Review
3b94f09756 Merge change 21929 into eclair
* changes:
  Fix device address check when profile state changes.
2009-08-19 12:32:09 -07:00
Jaikumar Ganesh
53121cf110 Fix device address check when profile state changes. 2009-08-19 12:25:37 -07:00
Android (Google) Code Review
f78227df41 Merge change 21838 into eclair
* changes:
  Fix RadioInfo for CDMA.
2009-08-19 12:12:49 -07:00
Suchi Amalapurapu
2c9b21f048 am d2136f7e: Create a shared preference setting and use it before loading/unloading cache and disable cache if file operations failed in the last launch. A simple if check when reading buffer size from file
Merge commit 'd2136f7e5da6d36a685f5bed2727f0abdafb70bf' into eclair

* commit 'd2136f7e5da6d36a685f5bed2727f0abdafb70bf':
  Create a shared preference setting and use it before loading/unloading cache
2009-08-18 19:51:39 -07:00
Suchi Amalapurapu
d2136f7e5d Create a shared preference setting and use it before loading/unloading cache
and disable cache if file operations failed in the last launch.
A simple if check when reading buffer size from file
2009-08-18 19:32:06 -07:00
jsh
87fa11b90e Fix RadioInfo for CDMA. 2009-08-18 18:00:15 -07:00
Jared Suttles
5807c64631 Allow optional nested parenthesis in the kernel compiler version string.
This fixes parsing of the kernel version string in so that groups
3 and 4 can be shown in About phone.

Submitted on behalf of Patrick Auchter <patrick.auchter@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
2009-08-18 10:26:00 -07:00
Nick Pelly
d63c011225 Bluetooth: Update Settings.apk to match BT API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
                  adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
                 (pair, connect, etc).
2009-08-17 17:09:44 -07:00
Michael Chan
5eb32e86a2 b/2005377 Fixed the problem where previously paired devics can't be access(grayed out) in Bluetooth settings after a reboot. 2009-08-14 13:57:25 -07:00
Michael Chan
110befc20e do not merge: cherry-pick e9f4f5dd39 from master branch 2009-08-14 13:33:49 -07:00
Romain Guy
e140b09d1d Remove wallpapers picker 2009-08-13 12:52:06 -07:00
Michael Chan
fdfb90f9e8 b/1770342 Bluetooth: Show the pair and connect when the user long touches a device without any supported profiles. 2009-08-12 15:38:01 -07:00
Android (Google) Code Review
ce6ec9fb34 Merge change 20986
* changes:
  b/2026622 Fixed the problem with the UI keeps showing that BT is scanning even though it has stopped. For some reason, the framework does not notify the settings app when the scan is done while the screen is off.
2009-08-12 14:32:30 -07:00
Michael Chan
e15d3a0cfb b/2026622 Fixed the problem with the UI keeps showing that BT is scanning even though it has stopped.
For some reason, the framework does not notify the settings app when the scan is done while the screen is off.
2009-08-12 14:27:18 -07:00
Amith Yamasani
8ccb9e0d33 Fix npe in leak fix. 2009-08-12 06:04:59 -07:00
Amith Yamasani
24bd892bde Fix a dialog leak. #1792635
Fixes the dialog leak when switching orientation in Development
settings.
2009-08-12 05:48:10 -07:00
Jean-Michel Trivi
443c8e3177 am 6dde8965: Fix bug 2045197. The TTS settings activity uses the default TTS stream type. Associate the volume control of this stream type with the volume control buttons.
Merge commit '6dde8965a089cff72a278a6f0904a180c077191d'

* commit '6dde8965a089cff72a278a6f0904a180c077191d':
  Fix bug 2045197.
2009-08-11 18:12:02 -07:00
Jean-Michel Trivi
6dde8965a0 Fix bug 2045197.
The TTS settings activity uses the default TTS stream type. Associate
the volume control of this stream type with the volume control buttons.
2009-08-11 09:06:58 -07:00
Dianne Hackborn
e25e4e4c57 Add new activity for picking live wallpapers. 2009-08-08 21:01:32 -07:00
Michael Chan
e41a4ca695 Modified the Bluetooth 2.1 Passkey confirmation dialog
- Changed the Passkey confirmation to show Pair/Don't Pair.
- Fixed the problem where the Ok button was showing up as Pair for the error dialog box.
- Disable the toasts when pairing failed in this case. Will need to check if this causes regression in other cases.
2009-08-04 18:20:17 -07:00
Chouting Zhang
5ee0635923 Remove 'SIM Card Lock' from Security & Location settings for CDMA phones. 2009-08-04 10:20:32 -07:00
Hung-ying Tyan
6fa32246b2 am 09cda9cf: Add VPN connection lost dialog.
Merge commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e'

* commit '09cda9cfaf658d85a5316cf6f07d5f8c038a942e':
  Add VPN connection lost dialog.
2009-08-03 01:37:54 -07:00
Hung-ying Tyan
09cda9cfaf Add VPN connection lost dialog. 2009-08-03 16:26:47 +08:00
Hung-ying Tyan
f8db1041f5 am 233991a2: Reduce the number of keystore connections to 1
Merge commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975'

* commit '233991a2420bd870a0f85e8e0c4c1c00eaf4b975':
  Reduce the number of keystore connections to 1
2009-08-02 18:42:37 -07:00
Hung-ying Tyan
233991a242 Reduce the number of keystore connections to 1
at entering the security settings.
2009-08-02 20:28:54 +08:00
Android (Google) Code Review
12fb9066a3 am 38322393: Merge change 9437 into donut
Merge commit '38322393a6d029349ef4ef4f80757da175029bcb'

* commit '38322393a6d029349ef4ef4f80757da175029bcb':
  Reduce the number of keystore connections.
2009-07-31 20:18:10 -07:00
Android (Google) Code Review
38322393a6 Merge change 9437 into donut
* changes:
  Reduce the number of keystore connections.
2009-07-31 20:15:37 -07:00
Hung-ying Tyan
79f9fa073c Reduce the number of keystore connections. 2009-08-01 10:08:03 +08:00
Amith Yamasani
498d90474b Add an icon to the left of the settings at the top level.
Add a new attribute for the icon.
Add place holder icons.
2009-07-31 07:24:08 -07:00
John Wang
4c47009172 am ed47f1e4: Fix the NullPointerException in Status Info.
Merge commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986'

* commit 'ed47f1e497abf5ad31b1c7035ae04478e9932986':
  Fix the NullPointerException in Status Info.
2009-07-30 18:58:55 -07:00
John Wang
ed47f1e497 Fix the NullPointerException in Status Info.
Fix bug 1964037 Phone states activity fail. It only happens in Zaku build. Zaku build overlay the device_info_status.xml under vendor/docomo and don't have CDMA related preference. Status.java will hit the NullPointerException when trying to remove the non-exist preferences.

	modified:   src/com/android/settings/deviceinfo/Status.java
2009-07-30 18:50:36 -07:00
Android (Google) Code Review
d20e072357 Merge change 9246
* changes:
  2005382 Disable long press on Bluetooth device when BT is off 1930418 Grey BT device when BT is off
2009-07-30 17:39:35 -07:00
Michael Chan
487843886d 2005382 Disable long press on Bluetooth device when BT is off
1930418 Grey BT device when BT is off
2009-07-30 16:35:44 -07:00
Android (Google) Code Review
9cfa368480 am 9c432349: Merge change 9142 into donut
Merge commit '9c432349a79cd0f19ebdee18deb2b0b8550d661f'

* commit '9c432349a79cd0f19ebdee18deb2b0b8550d661f':
  Add encryption option to PPTP UI.
2009-07-30 16:05:21 -07:00
Chung-yih Wang
844bb946af am c538b651: Fix some UI flow issues when the keystore is locked in WiFi setting.
Merge commit 'c538b651a23287ab25584995c6c4b7a68ece027c'

* commit 'c538b651a23287ab25584995c6c4b7a68ece027c':
  Fix some UI flow issues when the keystore is locked in WiFi setting.
2009-07-30 16:05:19 -07:00