OSDN Git Service

android-x86/packages-apps-Settings.git
15 years agoresolved conflicts for merge of e0b5f33c to master
Suchi Amalapurapu [Wed, 22 Jul 2009 00:16:35 +0000 (17:16 -0700)]
resolved conflicts for merge of e0b5f33c to master

15 years agoMerge change 7913 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 23:54:12 +0000 (16:54 -0700)]
Merge change 7913 into donut

* changes:
  Reorganize message posting when updating sizes and resources. Rather than posting a message for each package, post a message for  a set of packages(8) so that we don't end up posting too many messages and making the UI non-responsive by keeping the Handler too busy. We just pass the loaded info as a map in the message object. Changes to back ground threads that compute sizes and load resources.

15 years agoam 53a1e445: Merge change 8077 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 22:05:08 +0000 (15:05 -0700)]
am 53a1e445: Merge change 8077 into donut

Merge commit '53a1e445443865ef98f16652c7b403eee17499e8'

* commit '53a1e445443865ef98f16652c7b403eee17499e8':
  Implement the Back button handler to save a VPN.

15 years agoam ef2c5ac2: Merge change 8071 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 22:05:06 +0000 (15:05 -0700)]
am ef2c5ac2: Merge change 8071 into donut

Merge commit 'ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8'

* commit 'ef2c5ac2e4c42d0280c4c4839ec7286180fe4be8':
  Disable suggestion for certain types of text boxes.

15 years agoMerge change 8077 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 22:03:43 +0000 (15:03 -0700)]
Merge change 8077 into donut

* changes:
  Implement the Back button handler to save a VPN.

15 years agoMerge change 8071 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 22:03:31 +0000 (15:03 -0700)]
Merge change 8071 into donut

* changes:
  Disable suggestion for certain types of text boxes.

15 years agoImplement the Back button handler to save a VPN.
Hung-ying Tyan [Tue, 21 Jul 2009 21:44:39 +0000 (05:44 +0800)]
Implement the Back button handler to save a VPN.

15 years agoam 8d4faa9e: Merge change 7977 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 21:38:09 +0000 (14:38 -0700)]
am 8d4faa9e: Merge change 7977 into donut

Merge commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8'

* commit '8d4faa9ec3e29695b8d5d039bc8ac12d9bd655a8':
  Add a way to override the display names for locales in the locale picker.

15 years agoDisable suggestion for certain types of text boxes.
Hung-ying Tyan [Tue, 21 Jul 2009 21:05:46 +0000 (05:05 +0800)]
Disable suggestion for certain types of text boxes.

+ Disable suggestion for password, server name and domain suffices.
+ Use a shorter string to indicate that a secret is set.

15 years agoMerge change 7977 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 17:42:35 +0000 (10:42 -0700)]
Merge change 7977 into donut

* changes:
  Add a way to override the display names for locales in the locale picker.

15 years agoam 241610e9: Add password error hint when adding new cert.
Hung-ying Tyan [Tue, 21 Jul 2009 14:12:23 +0000 (07:12 -0700)]
am 241610e9: Add password error hint when adding new cert.

Merge commit '241610e986a8d2823f519762737903779089c253'

* commit '241610e986a8d2823f519762737903779089c253':
  Add password error hint when adding new cert.

15 years agoam a7fe59d0: Merge change 7974 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 06:33:58 +0000 (23:33 -0700)]
am a7fe59d0: Merge change 7974 into donut

Merge commit 'a7fe59d05d3393484e8c610962be70d29dee2cc4'

* commit 'a7fe59d05d3393484e8c610962be70d29dee2cc4':
  Removing translated text for compatibility option, which has been moved to SpareParts

15 years agoam 8fb0ec36: UI improvements for "Battery use" app.
Amith Yamasani [Tue, 21 Jul 2009 06:33:46 +0000 (23:33 -0700)]
am 8fb0ec36: UI improvements for "Battery use" app.

Merge commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c'

* commit '8fb0ec36ec2f4cb8e0a48020b1b6e79b7f45635c':
  UI improvements for "Battery use" app.

15 years agoMerge commit '5c20034b' into fix
Mitsuru Oshima [Tue, 21 Jul 2009 06:30:04 +0000 (23:30 -0700)]
Merge commit '5c20034b' into fix

Conflicts:

res/values/strings.xml

15 years agoAdd password error hint when adding new cert.
Hung-ying Tyan [Tue, 21 Jul 2009 01:41:30 +0000 (09:41 +0800)]
Add password error hint when adding new cert.

15 years agoAdd a way to override the display names for locales in the locale picker.
Eric Fischer [Tue, 21 Jul 2009 01:16:26 +0000 (18:16 -0700)]
Add a way to override the display names for locales in the locale picker.

In particular, show (the Chinese for) "Chinese (Simplified)" and "Chinese
(Traditional)" instead of "Chinese (China)" and "Chinese (Taiwan)".

15 years agoMerge change 7974 into donut
Android (Google) Code Review [Tue, 21 Jul 2009 00:59:56 +0000 (17:59 -0700)]
Merge change 7974 into donut

* changes:
  Removing translated text for compatibility option, which has been moved to SpareParts

15 years agoRemoving translated text for compatibility option, which has been moved to SpareParts
Mitsuru Oshima [Tue, 21 Jul 2009 00:44:51 +0000 (17:44 -0700)]
Removing translated text for compatibility option, which has been moved to SpareParts

15 years agoUI improvements for "Battery use" app.
Amith Yamasani [Mon, 13 Jul 2009 06:06:04 +0000 (23:06 -0700)]
UI improvements for "Battery use" app.

Change the controls UI to display a suggestion.
Bluetooth AT command tracking (not enabled yet).

15 years agomoving compatibility mode option to spare parts
Mitsuru Oshima [Mon, 20 Jul 2009 22:52:29 +0000 (15:52 -0700)]
moving compatibility mode option to spare parts

15 years agoReorganize message posting when updating sizes and resources. Rather than posting
Suchi Amalapurapu [Thu, 9 Jul 2009 19:05:46 +0000 (12:05 -0700)]
Reorganize message posting when updating sizes and resources. Rather than posting
a message for each package, post a message for  a set of packages(8) so that we don't
end up posting too many messages and making the UI non-responsive by keeping
the Handler too busy. We just pass the loaded info as a map in the message object.
Changes to back ground threads that compute sizes and load resources.

Add a new AppInfoCache class with some additional methods to load and persist cache.
As of now this just uses a raw file to cache application sizes and labels. We
could have gotten away with a simple map object but for clarity and future enhancements
just reorganized everything into a class. Load the cache in onCreate and persist
in onDestroy rather than start and stop. Using the cache we get < 1sec load times.
Peristing the cache has negligible performance effects. Remove multiple references to
cache and just use one object all over the code.

Rework AppInfo class and remove some confusing initializations. Also move the formatting
sizes part to back ground threads rather than in the constructor of AppInfo projects.
Formatting the sizes takes a lot of time and there is no point in blocking the UI thread
with this operation.

Changes to Adapter to use the newly created cache system. Define new comparator
for comparing application labels when sorting lists rather than using the one defined in
ApplicationInfo class which was loading the labels again in compare method. This was redundant
and since we cache these labels anyway, just use the cached labels instead. Rename and add
new methods for some of the new handler messages that send updates to a list of objects now.
Changes to removeFromList method and just remove entry from lists and cache linearly.

Also fix a bug in the adapter class where we reinit the list everytime the activity gets
restarted. Add a check here to invoke notifyDataSetChanged if underlying data changes.

Add some debug statements to record time.

15 years agoInitial 2.1 bluetooth support.
Jaikumar Ganesh [Fri, 17 Jul 2009 01:41:58 +0000 (18:41 -0700)]
Initial 2.1 bluetooth support.

Need to work with Strings and UI person to fix and later test everything.

15 years agoam ba127f57: Improve VpnSettings start-up time.
Hung-ying Tyan [Mon, 20 Jul 2009 04:14:28 +0000 (21:14 -0700)]
am ba127f57: Improve VpnSettings start-up time.

Merge commit 'ba127f57ae143a0c7fad5a46b327c04eb2254737'

* commit 'ba127f57ae143a0c7fad5a46b327c04eb2254737':
  Improve VpnSettings start-up time.

15 years agoam 628431de: Fix bug 1956707 in which setting the default language has no effect...
Jean-Michel Trivi [Mon, 20 Jul 2009 03:28:43 +0000 (20:28 -0700)]
am 628431de: Fix bug 1956707 in which setting the default language has no effect. Use the current Locale upon initialization of the TTS engine. Retrieve the default engine value from the TextToSpeech.Engine class instead of a hard-coded value in TextToSpeechSettings.

Merge commit '628431de91689b62a19e5fde0ed3b546bba7da74'

* commit '628431de91689b62a19e5fde0ed3b546bba7da74':
  Fix bug 1956707 in which setting the default language has no effect.

15 years agoImprove VpnSettings start-up time.
Hung-ying Tyan [Fri, 17 Jul 2009 18:55:56 +0000 (02:55 +0800)]
Improve VpnSettings start-up time.

* Changes
  + add orientation and keyboard config change in the manifest file.
  + remove state saving code
  + improve status checking time by doing it in one server connection.

15 years agoFix bug 1956707 in which setting the default language has no effect.
Jean-Michel Trivi [Fri, 17 Jul 2009 23:52:54 +0000 (16:52 -0700)]
Fix bug 1956707 in which setting the default language has no effect.
Use the current Locale upon initialization of the TTS engine.
Retrieve the default engine value from the TextToSpeech.Engine class
instead of a hard-coded value in TextToSpeechSettings.

15 years agoam 6b1b36a8: Merge change 7687 into donut
Android (Google) Code Review [Fri, 17 Jul 2009 22:43:07 +0000 (15:43 -0700)]
am 6b1b36a8: Merge change 7687 into donut

Merge commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6'

* commit '6b1b36a832943126d19a21dcadda11cc75c3a9b6':
  Add UI to handle PKCS12 cert.

15 years agoMerge change 7687 into donut
Android (Google) Code Review [Fri, 17 Jul 2009 17:24:27 +0000 (10:24 -0700)]
Merge change 7687 into donut

* changes:
  Add UI to handle PKCS12 cert.

15 years agoAdd UI to handle PKCS12 cert.
Hung-ying Tyan [Fri, 17 Jul 2009 12:58:06 +0000 (20:58 +0800)]
Add UI to handle PKCS12 cert.

15 years agoam f90682f4: Give an icon to Settings shortcuts.
Romain Guy [Fri, 17 Jul 2009 00:54:41 +0000 (17:54 -0700)]
am f90682f4: Give an icon to Settings shortcuts.

Merge commit 'f90682f4fb645ff45cbabcc0e7c3c26dc3cce599'

* commit 'f90682f4fb645ff45cbabcc0e7c3c26dc3cce599':
  Give an icon to Settings shortcuts.

15 years agoGive an icon to Settings shortcuts.
Romain Guy [Thu, 16 Jul 2009 22:06:44 +0000 (15:06 -0700)]
Give an icon to Settings shortcuts.

15 years agoam c3eaaad1: Fix "use secure credential" checkbox in Settings.
Hung-ying Tyan [Thu, 16 Jul 2009 16:55:11 +0000 (09:55 -0700)]
am c3eaaad1: Fix "use secure credential" checkbox in Settings.

Merge commit 'c3eaaad17ebe9a2cbe34b096511c8f06369dadd1'

* commit 'c3eaaad17ebe9a2cbe34b096511c8f06369dadd1':
  Fix "use secure credential" checkbox in Settings.

15 years agoFix "use secure credential" checkbox in Settings.
Hung-ying Tyan [Thu, 16 Jul 2009 07:24:42 +0000 (15:24 +0800)]
Fix "use secure credential" checkbox in Settings.

Uncheck the checkbox if the user cancels the password-entering dialog.

15 years agoam 599221c7: wifi: Update the AccessPointState network ID after saving configuration.
Mike Lockwood [Thu, 16 Jul 2009 01:13:56 +0000 (18:13 -0700)]
am 599221c7: wifi: Update the AccessPointState network ID after saving configuration.

Merge commit '599221c7bbd6cd613fd4f86805ccaf0696a3e78c'

* commit '599221c7bbd6cd613fd4f86805ccaf0696a3e78c':
  wifi: Update the AccessPointState network ID after saving configuration.

15 years agoMerge change 7449
Android (Google) Code Review [Wed, 15 Jul 2009 23:19:42 +0000 (16:19 -0700)]
Merge change 7449

* changes:
  b/1818390 Show Computer and Phone icons on such devices even if they support A2DP or HSP

15 years agob/1818390 Show Computer and Phone icons on such devices even if they support A2DP...
Michael Chan [Wed, 15 Jul 2009 22:14:12 +0000 (15:14 -0700)]
b/1818390 Show Computer and Phone icons on such devices even if they support A2DP or HSP

15 years agowifi: Update the AccessPointState network ID after saving configuration.
Mike Lockwood [Wed, 15 Jul 2009 15:55:32 +0000 (11:55 -0400)]
wifi: Update the AccessPointState network ID after saving configuration.

If there are more than 10 open access points, the network ID may have changed
after the configuration is saved.

Signed-off-by: Mike Lockwood <lockwood@android.com>
15 years agoMerge commit 'goog/readonly-korg-master' into merge_korg_master
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:13:07 +0000 (17:13 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master

15 years agochange all instances of displayed text 'apps' to 'applications'
Vivek Dlima [Tue, 14 Jul 2009 21:36:49 +0000 (14:36 -0700)]
change all instances of displayed text 'apps' to 'applications'

15 years agoUpdated Compatibility mode text.
Vivek Dlima [Tue, 14 Jul 2009 21:24:19 +0000 (14:24 -0700)]
Updated Compatibility mode text.

15 years agoam bc48d181: Merge change 7051 into donut
Android (Google) Code Review [Tue, 14 Jul 2009 17:21:27 +0000 (10:21 -0700)]
am bc48d181: Merge change 7051 into donut

Merge commit 'bc48d181fa9b1c1b516e3e9ece81e82069594022'

* commit 'bc48d181fa9b1c1b516e3e9ece81e82069594022':
  Use appropriate input types for edit fields in Apn settings.

15 years agoMerge change 7051 into donut
Android (Google) Code Review [Tue, 14 Jul 2009 01:53:06 +0000 (18:53 -0700)]
Merge change 7051 into donut

* changes:
  Use appropriate input types for edit fields in Apn settings.

15 years agoUse appropriate input types for edit fields in Apn settings.
Amith Yamasani [Tue, 14 Jul 2009 01:48:13 +0000 (18:48 -0700)]
Use appropriate input types for edit fields in Apn settings.

Turn off prediction and use proper input types.

15 years agoam 178dc98a: Merge change 6985 into donut
Android (Google) Code Review [Mon, 13 Jul 2009 23:59:37 +0000 (16:59 -0700)]
am 178dc98a: Merge change 6985 into donut

Merge commit '178dc98a7e0bba4ce0089d7ef6cb64c51c0411ca'

* commit '178dc98a7e0bba4ce0089d7ef6cb64c51c0411ca':
  Import new translations

15 years agoam 5c30845c: Fix #1930767 : "Share with Google" not working on orientation change.
Amith Yamasani [Mon, 13 Jul 2009 23:59:36 +0000 (16:59 -0700)]
am 5c30845c: Fix #1930767 : "Share with Google" not working on orientation change.

Merge commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513'

* commit '5c30845cf310a5d8c2de3e9ac809c97f736a9513':
  Fix #1930767 : "Share with Google" not working on orientation change.

15 years agoMerge change 6985 into donut
Android (Google) Code Review [Mon, 13 Jul 2009 23:37:45 +0000 (16:37 -0700)]
Merge change 6985 into donut

* changes:
  Import new translations

15 years agoImport new translations
Eric Fischer [Mon, 13 Jul 2009 22:49:57 +0000 (15:49 -0700)]
Import new translations

15 years agoFix #1930767 : "Share with Google" not working on orientation change.
Amith Yamasani [Mon, 13 Jul 2009 22:09:46 +0000 (15:09 -0700)]
Fix #1930767 : "Share with Google" not working on orientation change.

Discard the dialog after onSaveInstanceState. And check the different
onCreate scenarios before popping up the dialog.

15 years agoam fe0b0178: Fix VpnSettings.StatusChecker.start()
Hung-ying Tyan [Mon, 13 Jul 2009 09:44:49 +0000 (02:44 -0700)]
am fe0b0178: Fix VpnSettings.StatusChecker.start()

Merge commit 'fe0b0178cb2d24b8e6e1477055617bbf86a0808b'

* commit 'fe0b0178cb2d24b8e6e1477055617bbf86a0808b':
  Fix VpnSettings.StatusChecker.start()

15 years agoFix VpnSettings.StatusChecker.start()
Hung-ying Tyan [Mon, 13 Jul 2009 09:23:32 +0000 (17:23 +0800)]
Fix VpnSettings.StatusChecker.start()

to avoid multiple threads checking status at the same time.

15 years agoam 1ddccd07: Fix dialog handling.
Hung-ying Tyan [Mon, 13 Jul 2009 06:44:38 +0000 (23:44 -0700)]
am 1ddccd07: Fix dialog handling.

Merge commit '1ddccd07f744344b5248dd5418ee526f26d520dc'

* commit '1ddccd07f744344b5248dd5418ee526f26d520dc':
  Fix dialog handling.

15 years agoFix dialog handling.
Hung-ying Tyan [Sat, 11 Jul 2009 14:28:00 +0000 (22:28 +0800)]
Fix dialog handling.

* Changes
  + VpnSettings:
    + Add reconnect dialog to showDialog() framework for handling screen
      rotation.
    + Dismiss other alert dialogs in onDestroy()
    + Remove onPrepareDialog() from VpnSettings.
    + Remove updateConnectDialog() from VpnProfileActor.
    + Add authentication error dialog.
    + Add unknown server dialog.
  + SecuritySettings:
    + Make cstor dialogs cancelable.
    + Add cancelable listener.
  Patch Set 6:
  + VpnSettings:
    + Disable preferences when connecting/disconnecting.
    + Fix state broadcast when binding a VpnService goes wrong.

15 years agoam a5cead2c: Merge change 6705 into donut
Android (Google) Code Review [Fri, 10 Jul 2009 17:05:49 +0000 (10:05 -0700)]
am a5cead2c: Merge change 6705 into donut

Merge commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b'

* commit 'a5cead2cf7350e299d92112d513a1d4770d7b31b':
  Add translated time zone picker lists for several more languages.

15 years agoMerge change 6705 into donut
Android (Google) Code Review [Fri, 10 Jul 2009 17:03:32 +0000 (10:03 -0700)]
Merge change 6705 into donut

* changes:
  Add translated time zone picker lists for several more languages.

15 years agoAdd translated time zone picker lists for several more languages.
Eric Fischer [Fri, 10 Jul 2009 00:07:20 +0000 (17:07 -0700)]
Add translated time zone picker lists for several more languages.

15 years agoam 6dd27613: wifi: use new WifiManager.startScanActive() method to trigger scans.
Mike Lockwood [Thu, 9 Jul 2009 21:27:35 +0000 (14:27 -0700)]
am 6dd27613: wifi: use new WifiManager.startScanActive() method to trigger scans.

Merge commit '6dd27613b5ee59b1f0a90ad50fa080c0d98c47e2'

* commit '6dd27613b5ee59b1f0a90ad50fa080c0d98c47e2':
  wifi: use new WifiManager.startScanActive() method to trigger scans.

15 years agowifi: use new WifiManager.startScanActive() method to trigger scans.
Mike Lockwood [Wed, 8 Jul 2009 21:12:17 +0000 (17:12 -0400)]
wifi: use new WifiManager.startScanActive() method to trigger scans.

Signed-off-by: Mike Lockwood <lockwood@android.com>
15 years agoam 52844864: Merge change 6630 into donut
Android (Google) Code Review [Thu, 9 Jul 2009 19:50:46 +0000 (12:50 -0700)]
am 52844864: Merge change 6630 into donut

Merge commit '52844864a7a42030246ae664d42c78c96611ba4e'

* commit '52844864a7a42030246ae664d42c78c96611ba4e':
  Remove "no" locale strings.xml file that duplicates "nb" locale file.

15 years agoam e02f206e: Focus the password box when username is saved.
Hung-ying Tyan [Thu, 9 Jul 2009 19:49:33 +0000 (12:49 -0700)]
am e02f206e: Focus the password box when username is saved.

Merge commit 'e02f206e1161fc2d332db60395e74cca397ffa27'

* commit 'e02f206e1161fc2d332db60395e74cca397ffa27':
  Focus the password box when username is saved.

15 years agoam 66959341: Fix behavior of cancelling the name cred. dialog.
Hung-ying Tyan [Thu, 9 Jul 2009 19:49:23 +0000 (12:49 -0700)]
am 66959341: Fix behavior of cancelling the name cred. dialog.

Merge commit '66959341a6b0891893d4c851be708c3073f61154'

* commit '66959341a6b0891893d4c851be708c3073f61154':
  Fix behavior of cancelling the name cred. dialog.

15 years agoMerge change 6630 into donut
Android (Google) Code Review [Thu, 9 Jul 2009 18:55:11 +0000 (11:55 -0700)]
Merge change 6630 into donut

* changes:
  Remove "no" locale strings.xml file that duplicates "nb" locale file.

15 years agoRemove "no" locale strings.xml file that duplicates "nb" locale file.
Eric Fischer [Thu, 9 Jul 2009 18:03:02 +0000 (11:03 -0700)]
Remove "no" locale strings.xml file that duplicates "nb" locale file.

15 years agoFocus the password box when username is saved.
Hung-ying Tyan [Thu, 9 Jul 2009 10:39:04 +0000 (18:39 +0800)]
Focus the password box when username is saved.

15 years agoFix behavior of cancelling the name cred. dialog.
Hung-ying Tyan [Thu, 9 Jul 2009 03:45:02 +0000 (11:45 +0800)]
Fix behavior of cancelling the name cred. dialog.

The code used to trying to store the credential even when the user
cancels the dialog. Fixed in this CL.

15 years agoam 7063f371: Merge change 6467 into donut
Android (Google) Code Review [Wed, 8 Jul 2009 19:06:25 +0000 (12:06 -0700)]
am 7063f371: Merge change 6467 into donut

Merge commit '7063f37102a334798349d4672981e52cba9cc0bd'

* commit '7063f37102a334798349d4672981e52cba9cc0bd':
  Tighten factory data reset text. Bug 1966926.

15 years agoMerge change 6467 into donut
Android (Google) Code Review [Wed, 8 Jul 2009 19:05:24 +0000 (12:05 -0700)]
Merge change 6467 into donut

* changes:
  Tighten factory data reset text. Bug 1966926.

15 years agoam 386668b7: Fix saving secrets to keystore from vpn settings.
Hung-ying Tyan [Wed, 8 Jul 2009 16:01:32 +0000 (09:01 -0700)]
am 386668b7: Fix saving secrets to keystore from vpn settings.

Merge commit '386668b79255917e2ddc17fd276f642be4d8089a'

* commit '386668b79255917e2ddc17fd276f642be4d8089a':
  Fix saving secrets to keystore from vpn settings.

15 years agoTighten factory data reset text. Bug 1966926.
Roy West [Wed, 8 Jul 2009 15:03:35 +0000 (08:03 -0700)]
Tighten factory data reset text. Bug 1966926.

15 years agoFix saving secrets to keystore from vpn settings.
Hung-ying Tyan [Wed, 8 Jul 2009 08:39:48 +0000 (16:39 +0800)]
Fix saving secrets to keystore from vpn settings.

15 years agoam 2368d045: Merge change 6440 into donut
Android (Google) Code Review [Wed, 8 Jul 2009 06:56:10 +0000 (23:56 -0700)]
am 2368d045: Merge change 6440 into donut

Merge commit '2368d0455ccae5e373fe79c66c1f6ce1ce0a3c72'

* commit '2368d0455ccae5e373fe79c66c1f6ce1ce0a3c72':
  Trigger backup of locale change.

15 years agoMerge change 6440 into donut
Android (Google) Code Review [Wed, 8 Jul 2009 02:00:13 +0000 (19:00 -0700)]
Merge change 6440 into donut

* changes:
  Trigger backup of locale change.

15 years agoam f96fb705: Merge change 6432 into donut
Android (Google) Code Review [Wed, 8 Jul 2009 00:45:59 +0000 (17:45 -0700)]
am f96fb705: Merge change 6432 into donut

Merge commit 'f96fb705f5b63177a79379b68dde307105b46f21'

* commit 'f96fb705f5b63177a79379b68dde307105b46f21':
  In the TTS settings: rely on the default locale rather than default

15 years agoMerge change 6432 into donut
Android (Google) Code Review [Wed, 8 Jul 2009 00:44:32 +0000 (17:44 -0700)]
Merge change 6432 into donut

* changes:
  In the TTS settings: rely on the default locale rather than default values stored in TextToSpeech.Engine to initialize the default TTS country and variant.

15 years agoam eb72bcd6: Fix vibrate and silent mode toggle dependency.
Amith Yamasani [Wed, 8 Jul 2009 00:24:43 +0000 (17:24 -0700)]
am eb72bcd6: Fix vibrate and silent mode toggle dependency.

Merge commit 'eb72bcd6d07708bfc65eec474092f136e822c9fb'

* commit 'eb72bcd6d07708bfc65eec474092f136e822c9fb':
  Fix vibrate and silent mode toggle dependency.

15 years agoIn the TTS settings: rely on the default locale rather than default
Jean-Michel Trivi [Wed, 8 Jul 2009 00:08:32 +0000 (17:08 -0700)]
In the TTS settings: rely on the default locale rather than default
values stored in TextToSpeech.Engine to initialize the default TTS
country and variant.

15 years agoFix vibrate and silent mode toggle dependency.
Amith Yamasani [Tue, 7 Jul 2009 18:37:08 +0000 (11:37 -0700)]
Fix vibrate and silent mode toggle dependency.

15 years agoTrigger backup of locale change.
Amith Yamasani [Tue, 7 Jul 2009 21:38:41 +0000 (14:38 -0700)]
Trigger backup of locale change.

15 years agoAdd toast to settings widget.
Ken Shirriff [Tue, 30 Jun 2009 23:45:14 +0000 (16:45 -0700)]
Add toast to settings widget.

When the settings widget updates bluetooth or wifi, display a
toast since they are slow to update.
Also fix some long lines.

bug=1918321

15 years agoam c4a3bf94: Merge change 6345 into donut
Android (Google) Code Review [Tue, 7 Jul 2009 14:08:40 +0000 (07:08 -0700)]
am c4a3bf94: Merge change 6345 into donut

Merge commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da'

* commit 'c4a3bf94cc870d940df37756ed2c5ea7067d00da':
  Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.

15 years agoMerge change 6345 into donut
Android (Google) Code Review [Tue, 7 Jul 2009 14:07:17 +0000 (07:07 -0700)]
Merge change 6345 into donut

* changes:
  Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.

15 years agoAdd header 'blob://' in front of the cert/key names in wpa_supplicant.conf.
Chung-yih Wang [Tue, 7 Jul 2009 13:58:13 +0000 (21:58 +0800)]
Add header 'blob://' in front of the cert/key names in wpa_supplicant.conf.

1. This addition is from CL 6082 change in wpa_supplicant.
2. Fix the empty password pop-up for EAP.

15 years agoam 423ab2eb: Merge change 6328 into donut
Android (Google) Code Review [Tue, 7 Jul 2009 03:45:50 +0000 (20:45 -0700)]
am 423ab2eb: Merge change 6328 into donut

Merge commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f'

* commit '423ab2eb9df5e2866ecb1f5f975f2f7a660d334f':
  String fixes for the credential storage and vpn settings.

15 years agoMerge change 6328 into donut
Android (Google) Code Review [Tue, 7 Jul 2009 03:44:44 +0000 (20:44 -0700)]
Merge change 6328 into donut

* changes:
  String fixes for the credential storage and vpn settings.

15 years agoString fixes for the credential storage and vpn settings.
Hung-ying Tyan [Tue, 7 Jul 2009 02:35:45 +0000 (10:35 +0800)]
String fixes for the credential storage and vpn settings.

* Changes
  + Shorten the messages for both set-password and enter-password dialogs
    when other activities access the credential storage.
  Patch Set 2:
  + Fix the capital issue in the vpn error messages.
    + Add separate strings for terms used in the error messages.
    + Modify related src files that use those terms.

15 years agoam 879f7bcf: Merge change 6272 into donut
Android (Google) Code Review [Tue, 7 Jul 2009 00:05:23 +0000 (17:05 -0700)]
am 879f7bcf: Merge change 6272 into donut

Merge commit '879f7bcf41782940fff3ffcb3586d606361360c6'

* commit '879f7bcf41782940fff3ffcb3586d606361360c6':
  Fix bug 1946195 by making use of the current Locale to set a default value

15 years agoMerge change 6272 into donut
Android (Google) Code Review [Tue, 7 Jul 2009 00:03:03 +0000 (17:03 -0700)]
Merge change 6272 into donut

* changes:
  Fix bug 1946195 by making use of the current Locale to set a default value in the language pref list (bug was no selection in the default language list). Fix half of bug 1956707 where speech rate value as read from the settings was translated to a ratio, which applied an improper speech rate on the TTS engine (bug was setting a default rate makes the TTS demo unintelligible). Moved logic to set the default value in the language pref list in a separate private method to improve readability. Changed default rate values so that normal is 1x and the fastest is 2x.

15 years agoFix bug 1946195 by making use of the current Locale to set a default value
Jean-Michel Trivi [Mon, 6 Jul 2009 21:04:54 +0000 (14:04 -0700)]
Fix bug 1946195 by making use of the current Locale to set a default value
in the language pref list (bug was no selection in the default language list).
Fix half of bug 1956707 where speech rate value as read from the settings
was translated to a ratio, which applied an improper speech rate on the
TTS engine (bug was setting a default rate makes the TTS demo unintelligible).
Moved logic to set the default value in the language pref list in a separate
private method to improve readability.
Changed default rate values so that normal is 1x and the fastest is 2x.

15 years agoam 0a59b500: Integrate VPN with new keystore and misc fixes.
Hung-ying Tyan [Mon, 6 Jul 2009 18:22:33 +0000 (11:22 -0700)]
am 0a59b500: Integrate VPN with new keystore and misc fixes.

Merge commit '0a59b500147cc038541f6f2897de7e28c15a12c1'

* commit '0a59b500147cc038541f6f2897de7e28c15a12c1':
  Integrate VPN with new keystore and misc fixes.

15 years agoam eb7836f1: Apply the new keystore and certtool library in Wifi setting.
Chung-yih Wang [Mon, 6 Jul 2009 18:22:32 +0000 (11:22 -0700)]
am eb7836f1: Apply the new keystore and certtool library in Wifi setting.

Merge commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe'

* commit 'eb7836f11ec4e9753db7c6ecd9414e153bb7bdbe':
  Apply the new keystore and certtool library in Wifi setting.

15 years agoam 4e45d392: Add certificate to keystore for the ADD intent
Hung-ying Tyan [Mon, 6 Jul 2009 18:22:15 +0000 (11:22 -0700)]
am 4e45d392: Add certificate to keystore for the ADD intent

Merge commit '4e45d392ada4e84fbeed06874caebfd3c7759073'

* commit '4e45d392ada4e84fbeed06874caebfd3c7759073':
  Add certificate to keystore for the ADD intent

15 years agoam d40b9c5d: Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL
Hung-ying Tyan [Mon, 6 Jul 2009 18:22:14 +0000 (11:22 -0700)]
am d40b9c5d: Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL

Merge commit 'd40b9c5dff4b8866f188ba8166cba4fb657fafb2'

* commit 'd40b9c5dff4b8866f188ba8166cba4fb657fafb2':
  Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL

15 years agoam 6a0544be: Fix strings.
Hung-ying Tyan [Mon, 6 Jul 2009 18:22:04 +0000 (11:22 -0700)]
am 6a0544be: Fix strings.

Merge commit '6a0544be5cf7ed8b19628f292e4045e1f3f7cb2f'

* commit '6a0544be5cf7ed8b19628f292e4045e1f3f7cb2f':
  Fix strings.

15 years agoam 7031ab0d: Add credential storage settings.
Hung-ying Tyan [Mon, 6 Jul 2009 18:21:57 +0000 (11:21 -0700)]
am 7031ab0d: Add credential storage settings.

Merge commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1'

* commit '7031ab0d756327496ac3ce1e082b53c94be2f3b1':
  Add credential storage settings.

15 years agoIntegrate VPN with new keystore and misc fixes.
Hung-ying Tyan [Mon, 6 Jul 2009 09:26:34 +0000 (17:26 +0800)]
Integrate VPN with new keystore and misc fixes.

* Changes
  + Pass intent to keystore when needed and hooks to resume from it.
  + Generate random, unique ID for profile instead of base64 from its
    name.
  + Add VPN to "Wirless controls" description.
  + Add credential storage to "Security & location" description.
  + More hints to set password and unlock dialogs in credential storage
    settings for actions that come from other processes.
  + Sort VPN profiles according to the names.
  + Replace Keystore with CertTool in L2tpIpsecEditor

15 years agoApply the new keystore and certtool library in Wifi setting.
Chung-yih Wang [Mon, 6 Jul 2009 09:03:53 +0000 (17:03 +0800)]
Apply the new keystore and certtool library in Wifi setting.

1. Certificate related APIs were moved to CertTool. Therefore,
   we have to migrate to CertTool instead.
2. Unlock the keystore if it is not unlocked yet(send the intent
   out to credential storage) for EAP access points.
3. Add Password field for WPA_EAP and IEEE8021X(this is for
   phase 2 auth.)

15 years agoAdd certificate to keystore for the ADD intent
Hung-ying Tyan [Sat, 4 Jul 2009 18:45:26 +0000 (02:45 +0800)]
Add certificate to keystore for the ADD intent

15 years agoAdd UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL
Hung-ying Tyan [Sat, 4 Jul 2009 02:16:07 +0000 (10:16 +0800)]
Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL

Add UNLOCK_CREDENTIAL_STORAGE and ADD_CREDENTIAL intents to manifest.

15 years agoFix strings.
Hung-ying Tyan [Fri, 3 Jul 2009 16:39:58 +0000 (00:39 +0800)]
Fix strings.

* Changes
  + "Disconnect from network"
  + "Remember username"
  + "Unable to connect to the network"

15 years agoam 132b2144: Disable the individual remote Bluetooth devices when BT is off
Michael Chan [Fri, 3 Jul 2009 15:17:50 +0000 (08:17 -0700)]
am 132b2144: Disable the individual remote Bluetooth devices when BT is off

Merge commit '132b21440b1b930322fc129a504afa6107835f8e'

* commit '132b21440b1b930322fc129a504afa6107835f8e':
  Disable the individual remote Bluetooth devices when BT is off

15 years agoAdd credential storage settings.
Hung-ying Tyan [Wed, 1 Jul 2009 16:26:46 +0000 (00:26 +0800)]
Add credential storage settings.

* Changes
  + Initial implementation of credential storage settings.
  + Use alert icon on delete and reconnect dialogs in VpnSettings.
    (piggy-backed)
  Patch Set 12:
  + Add password length and no-space verification.
  + Simplify dialog view xml files.