Commit Graph

141854 Commits

Author SHA1 Message Date
Karl Rosaen
b732a2848e Improve layout of lock tutorial, especially improved for sholes.
Now, instead of having equal space overall above and below lock pattern widget,
the lock pattern widget is centered within the space above the button bar
at the bottom.  Also, removing the line below the lock pattern widget per
romain's recommendation; it looks goofy with the button bar below.

see screen shots in http://b/2045023 for the differences.
2009-08-12 16:42:38 -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
Eric Fischer
924bf59edd am c9e5fc45: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'c9e5fc45b0e9eb322865260d03fd2f36b28f3c98'

* commit 'c9e5fc45b0e9eb322865260d03fd2f36b28f3c98':
  Import revised translations.  DO NOT MERGE
2009-08-11 18:11:46 -07:00
Eric Fischer
3d29e5d9c6 am a016cb00: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'a016cb00484af55ca77d4eb7c3b61950ddfb8319'

* commit 'a016cb00484af55ca77d4eb7c3b61950ddfb8319':
  Import revised translations.  DO NOT MERGE
2009-08-11 18:11:06 -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
Eric Fischer
c9e5fc45b0 Import revised translations. DO NOT MERGE 2009-08-10 17:57:14 -07:00
Eric Fischer
a016cb0048 Import revised translations. DO NOT MERGE 2009-08-10 10:48:54 -07:00
Dianne Hackborn
e25e4e4c57 Add new activity for picking live wallpapers. 2009-08-08 21:01:32 -07:00
Android (Google) Code Review
ede25bc845 Merge change 20355
* changes:
  Re-ordered some Settings and renamed some.
2009-08-07 06:34:08 -07:00
Jeff Sharkey
7e4a019e19 am 6c3287a4: Adopt new AppWidget assets, per http://b/2038594.
Merge commit '6c3287a4d3a8e02322b501034db3133a3ccb1051'

* commit '6c3287a4d3a8e02322b501034db3133a3ccb1051':
  Adopt new AppWidget assets, per http://b/2038594.
2009-08-06 22:57:48 -07:00
Jeff Sharkey
6c3287a4d3 Adopt new AppWidget assets, per http://b/2038594. 2009-08-06 22:37:08 -07:00
Amith Yamasani
7f28787edf Re-ordered some Settings and renamed some.
Reduced padding around the icons in the top level screen.
Re-ordered top-level settings.
Moved Airplane mode to the top of wireless & networks.
2009-08-06 16:43:23 -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
Jean-Baptiste Queru
caf7d199e8 merge from open-source master 2009-08-04 09:00:29 -07:00
Jean-Baptiste Queru
2877e184f3 merge from donut 2009-08-03 07:45:47 -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
Jim Miller
b6f1080058 Change resource string to "Accounts & Synchronization" 2009-07-31 18:00:06 -07: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
Amith Yamasani
5f1d3351cc am 03f46bf4: Remove link to Contributors. Fix for #2022496
Merge commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb'

* commit '03f46bf48e41b0b2e43fd4c2d6dc0eb213d55fdb':
  Remove link to Contributors. Fix for #2022496
2009-07-30 16:05:18 -07:00
Android (Google) Code Review
a4fe66fdc7 am 79748b42: Merge change 9000 into donut
Merge commit '79748b42e3e891c0d1541753c133fa83638146ce'

* commit '79748b42e3e891c0d1541753c133fa83638146ce':
  Fix duplicate entries being added when application is in active use
2009-07-30 09:56:29 -07:00
Android (Google) Code Review
3deea37da3 Merge change 9116
* changes:
  Allow enabling Wifi when in airplane mode.
2009-07-30 08:35:41 -07:00
Jean-Michel Trivi
4867faafa1 am 387dc0ca: Fix bug 2017664. Use the new constant names in TextToSpeech.
Merge commit '387dc0ca9c990511a71bd71c77d34ee33bc3f1aa'

* commit '387dc0ca9c990511a71bd71c77d34ee33bc3f1aa':
  Fix bug 2017664.
2009-07-30 06:56:28 -07:00
Android (Google) Code Review
9c432349a7 Merge change 9142 into donut
* changes:
  Add encryption option to PPTP UI.
2009-07-30 05:23:06 -07:00
Chung-yih Wang
c538b651a2 Fix some UI flow issues when the keystore is locked in WiFi setting.
To make it more user friendly, we need to continue on what
users intend to do after unlocking the credential storage.
2009-07-30 20:03:16 +08:00
Hung-ying Tyan
7be218e7f7 Add encryption option to PPTP UI.
Also add new error dialogs for L2TP challenge error and remote server
hanging up error.
2009-07-30 19:54:13 +08:00
Mike Lockwood
83bcc98af1 Allow enabling Wifi when in airplane mode.
If the new system settings value for AIRPLANE_MODE_TOGGLEABLE_RADIOS
contains RADIO_WIFI, then the user will be allowed to enable Wifi
while in airplane mode.
Turning on airplane mode will still disable Wifi, but the user will
be free to reenable it in the Settings app.

We also allow access to the VPN settings under the same circumstances.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-29 23:53:44 -07:00
Amith Yamasani
03f46bf48e Remove link to Contributors. Fix for #2022496 2009-07-29 21:03:54 -07:00
Hung-ying Tyan
a7aaffa8ac am c157aadf: Add error dialog when secrets are missing.
Merge commit 'c157aadf5682e417ace8e4cf3fba498e6953cad3'

* commit 'c157aadf5682e417ace8e4cf3fba498e6953cad3':
  Add error dialog when secrets are missing.
2009-07-29 16:45:25 -07:00
Android (Google) Code Review
79748b42e3 Merge change 9000 into donut
* changes:
  Fix duplicate entries being added when application is in active use
2009-07-29 15:48:15 -07:00
Jean-Baptiste Queru
5f16c148da merge from donut 2009-07-29 14:57:07 -07:00
Suchi Amalapurapu
489eaccb98 Fix duplicate entries being added when application is in active use 2009-07-29 11:38:17 -07:00
Jean-Michel Trivi
387dc0ca9c Fix bug 2017664.
Use the new constant names in TextToSpeech.
2009-07-29 11:24:25 -07:00