OSDN Git Service
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
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
Jean-Baptiste Queru [Wed, 15 Jul 2009 00:13:07 +0000 (17:13 -0700)]
Merge commit 'goog/readonly-korg-master' into merge_korg_master
Vivek Dlima [Tue, 14 Jul 2009 21:36:49 +0000 (14:36 -0700)]
change all instances of displayed text 'apps' to 'applications'
Vivek Dlima [Tue, 14 Jul 2009 21:24:19 +0000 (14:24 -0700)]
Updated Compatibility mode text.
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.
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.
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.
Android (Google) Code Review [Mon, 13 Jul 2009 23:59:37 +0000 (16:59 -0700)]
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.
Android (Google) Code Review [Mon, 13 Jul 2009 23:37:45 +0000 (16:37 -0700)]
Merge change 6985 into donut
* changes:
Import new translations
Eric Fischer [Mon, 13 Jul 2009 22:49:57 +0000 (15:49 -0700)]
Import new translations
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.
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()
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.
Hung-ying Tyan [Mon, 13 Jul 2009 06:44:38 +0000 (23:44 -0700)]
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.
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.
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.
Eric Fischer [Fri, 10 Jul 2009 00:07:20 +0000 (17:07 -0700)]
Add translated time zone picker lists for several more languages.
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.
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>
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.
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.
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.
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.
Eric Fischer [Thu, 9 Jul 2009 18:03:02 +0000 (11:03 -0700)]
Remove "no" locale strings.xml file that duplicates "nb" locale file.
Hung-ying Tyan [Thu, 9 Jul 2009 10:39:04 +0000 (18:39 +0800)]
Focus the password box when username is saved.
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.
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.
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.
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.
Roy West [Wed, 8 Jul 2009 15:03:35 +0000 (08:03 -0700)]
Tighten factory data reset text. Bug
1966926.
Hung-ying Tyan [Wed, 8 Jul 2009 08:39:48 +0000 (16:39 +0800)]
Fix saving secrets to keystore from vpn settings.
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.
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.
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
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.
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.
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.
Amith Yamasani [Tue, 7 Jul 2009 18:37:08 +0000 (11:37 -0700)]
Fix vibrate and silent mode toggle dependency.
Amith Yamasani [Tue, 7 Jul 2009 21:38:41 +0000 (14:38 -0700)]
Trigger backup of locale change.
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
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.
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.
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.
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.
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.
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.
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
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.
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.
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.
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.
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
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
Hung-ying Tyan [Mon, 6 Jul 2009 18:22:04 +0000 (11:22 -0700)]
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.
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
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.)
Hung-ying Tyan [Sat, 4 Jul 2009 18:45:26 +0000 (02:45 +0800)]
Add certificate to keystore for the ADD intent
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.
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"
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
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.
Hung-ying Tyan [Thu, 2 Jul 2009 21:25:19 +0000 (14:25 -0700)]
Jean-Michel Trivi [Thu, 2 Jul 2009 05:44:24 +0000 (22:44 -0700)]
am
88ec7ebf: Fix bug
1943785 where the default country string could be accessed while still being null. This was due to Settings.Secure.getString() returning null when a property isn\'t found, instead of a string with the value "null".
Merge commit '
88ec7ebfe935c0541df3289c31574adbc01bd8bb'
* commit '
88ec7ebfe935c0541df3289c31574adbc01bd8bb':
Fix bug
1943785 where the default country string could be accessed while
Michael Chan [Wed, 1 Jul 2009 21:06:43 +0000 (14:06 -0700)]
Disable the individual remote Bluetooth devices when BT is off
Ken Shirriff [Wed, 1 Jul 2009 18:18:38 +0000 (11:18 -0700)]
am
311356dd: Redo power widget layout with the proper widget style.
Merge commit '
311356dd71eb33a383fb9a5b470517103ea1f424'
* commit '
311356dd71eb33a383fb9a5b470517103ea1f424':
Redo power widget layout with the proper widget style.
Hung-ying Tyan [Wed, 1 Jul 2009 03:06:45 +0000 (11:06 +0800)]
Add L2tpIpsecPskEditor.
* Changes
+ Add L2tpIpsecPskEditor.java.
+ Save profile name in VpnEditor to be used in saveSecrets().
Jean-Michel Trivi [Tue, 30 Jun 2009 22:09:23 +0000 (15:09 -0700)]
Fix bug
1943785 where the default country string could be accessed while
still being null. This was due to Settings.Secure.getString() returning
null when a property isn't found, instead of a string with the value "null".
Dianne Hackborn [Tue, 30 Jun 2009 03:20:07 +0000 (20:20 -0700)]
am
116d85ea: Clean up some of the intent filters in the manifest.
Merge commit '
116d85eaa7e6a97e5fa0c3c01cb16822a3b6519c'
* commit '
116d85eaa7e6a97e5fa0c3c01cb16822a3b6519c':
Clean up some of the intent filters in the manifest.
Ken Shirriff [Mon, 29 Jun 2009 23:23:07 +0000 (16:23 -0700)]
Redo power widget layout with the proper widget style.
The power widget now uses the fuzzy-edged widget background.
It has a resonable layout in portrait and landscape.
appwidget_inner is the background for a button on the inside, with a border on the left.
appwidget_outer is the background for a button on the outside (i.e. leftmost); it
does not have a border.
Dianne Hackborn [Sat, 27 Jun 2009 01:20:23 +0000 (18:20 -0700)]
Clean up some of the intent filters in the manifest.
Hung-ying Tyan [Fri, 26 Jun 2009 08:07:01 +0000 (01:07 -0700)]
am
e7565f3c: Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
Merge commit '
e7565f3c48e6c90e65d9c15e33d20673a187c156'
* commit '
e7565f3c48e6c90e65d9c15e33d20673a187c156':
Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
Hung-ying Tyan [Fri, 26 Jun 2009 06:24:50 +0000 (14:24 +0800)]
Add L2TP secret, L2TP/IPSec PSK support. Fix screen orientation.
* Changes
+ Add L2tpActor, L2tpEditor, L2tpIpsecPskActor.
+ Make L2tpIpsecEditor extend L2tpEditor.
+ Revise the code for saving username. Make
VpnSettings.saveProfileToStorage() static.
+ Fix support for screen orientation change in both VpnSettings and
VpnEditor.
Patch Set 2:
+ Remove Util.isNullOrEmpty(). Use TextUtils.isEmpty() instead.
+ Remove unused imports. Wrap lines longer than 80 chars.
Patch Set 3:
+ Fix all the strings according to UI feedback.
+ Remove all the added actor subclasses and move password to editor.
+ Remove VPN entry in Security & location.
Patch Set 4:
+ Misc string fixes.
Patch Set 5:
+ Add strings for credential storage settings.
+ Changed the error dialog icon.
+ Fix "Remember me" indentation in connect dialog.
Patch Set 6:
+ resolve res/values/strings.xml
Chouting Zhang [Fri, 26 Jun 2009 05:06:36 +0000 (22:06 -0700)]
Chouting Zhang [Wed, 24 Jun 2009 19:25:43 +0000 (14:25 -0500)]
CDMA Settings additions
This patch implement CDMA Settings features
1. Add code to get MEID, MIN, and PRL value if the phone is a CDMA Phone
2. Display MEID, MIN, and PRL on Settings screen if it is a CDMA phone
3. Do not display IMSI, IMEI, and IMEI SV for a CDMA phone
Roy West [Thu, 25 Jun 2009 23:50:42 +0000 (16:50 -0700)]
am
d2e3b013: Edit second line of Search settings. First part of fix to bug1928620.
Merge commit '
d2e3b0139009b98be5ed825e58c38a325240594e'
* commit '
d2e3b0139009b98be5ed825e58c38a325240594e':
Edit second line of Search settings. First part of fix to bug1928620.
Mike Lockwood [Thu, 25 Jun 2009 20:39:48 +0000 (16:39 -0400)]
Settings: Add preference to enable/disable assisted GPS.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Roy West [Thu, 25 Jun 2009 20:40:28 +0000 (13:40 -0700)]
Edit second line of Search settings. First part of fix to bug1928620.
Android (Google) Code Review [Thu, 25 Jun 2009 19:40:38 +0000 (12:40 -0700)]
Android (Google) Code Review [Thu, 25 Jun 2009 19:38:11 +0000 (12:38 -0700)]
Merge change 5391 into donut
* changes:
Fix an NPE.
Amith Yamasani [Thu, 25 Jun 2009 19:27:21 +0000 (12:27 -0700)]
Fix an NPE.
Sometimes name is null, compare the other way around.
Android (Google) Code Review [Thu, 25 Jun 2009 19:20:03 +0000 (12:20 -0700)]
am
517ce789: Merge change 5374 into donut
Merge commit '
517ce789b4c624c6e15b9f6ca2f5757396315247'
* commit '
517ce789b4c624c6e15b9f6ca2f5757396315247':
Remove pitch selection from TTS settings.
Android (Google) Code Review [Thu, 25 Jun 2009 19:18:54 +0000 (12:18 -0700)]
Merge change 5374 into donut
* changes:
Remove pitch selection from TTS settings. Use the settings name for the locale property rather than the UI key. Add prefs entry to install the voice data.
Mike Lockwood [Thu, 25 Jun 2009 17:51:06 +0000 (10:51 -0700)]
am
b7e46e89: Display a warning dialog when the user enables USB debugging.
Merge commit '
b7e46e89d77574dbb51855144ea3d46fcf220bbb'
* commit '
b7e46e89d77574dbb51855144ea3d46fcf220bbb':
Display a warning dialog when the user enables USB debugging.
Mike Lockwood [Thu, 25 Jun 2009 17:36:00 +0000 (13:36 -0400)]
Display a warning dialog when the user enables USB debugging.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jean-Michel Trivi [Thu, 25 Jun 2009 17:03:43 +0000 (10:03 -0700)]
Remove pitch selection from TTS settings.
Use the settings name for the locale property rather than the UI key.
Add prefs entry to install the voice data.
Amith Yamasani [Thu, 25 Jun 2009 07:49:06 +0000 (00:49 -0700)]
Amith Yamasani [Fri, 19 Jun 2009 16:27:35 +0000 (09:27 -0700)]
Track native processes.
Add gauge to detail screen and make it look like the item from summary screen.
Some string changes.
Dianne Hackborn [Thu, 25 Jun 2009 03:37:05 +0000 (20:37 -0700)]
am
a54672f3: Some cleanup of settings launching, adding shortcuts.
Merge commit '
a54672f3a983766cf1dce754b3887807fcb723fa'
* commit '
a54672f3a983766cf1dce754b3887807fcb723fa':
Some cleanup of settings launching, adding shortcuts.
Dianne Hackborn [Wed, 24 Jun 2009 19:45:09 +0000 (12:45 -0700)]
Some cleanup of settings launching, adding shortcuts.
- Move the battery usage item from applications to phone info.
- Give the battery usage item a summary.
- Fiddle with the manifest to make it so we can launch parts of the settings
app without messing up launching of the main app. (That is, remove
affinities so they each are treated as different tasks.)
- Add the ability to make shortcuts to some key settings panels.
Roy West [Wed, 24 Jun 2009 22:44:34 +0000 (15:44 -0700)]
am
74b53da2: Additional edits to strings when uninstalling system app updates.
Merge commit '
74b53da2532e3c611f712d80a50445ae5c7863a0'
* commit '
74b53da2532e3c611f712d80a50445ae5c7863a0':
Additional edits to strings when uninstalling system app updates.
Amith Yamasani [Wed, 24 Jun 2009 22:44:33 +0000 (15:44 -0700)]
am
972fc298: Description and suggestion strings for Battery Usage detail screens.
Merge commit '
972fc2989aba6757e5128aaf8d800fed04f8400f'
* commit '
972fc2989aba6757e5128aaf8d800fed04f8400f':
Description and suggestion strings for Battery Usage detail screens.
Roy West [Wed, 24 Jun 2009 16:25:12 +0000 (09:25 -0700)]
Additional edits to strings when uninstalling system app updates.
Fixes bug
1940257.
Amith Yamasani [Tue, 23 Jun 2009 06:04:45 +0000 (23:04 -0700)]
Description and suggestion strings for Battery Usage detail screens.
Amith Yamasani [Tue, 23 Jun 2009 06:04:45 +0000 (23:04 -0700)]
Description and suggestion strings for Battery Usage detail screens.
Roy West [Wed, 24 Jun 2009 00:16:07 +0000 (17:16 -0700)]
Roy West [Tue, 23 Jun 2009 23:53:37 +0000 (16:53 -0700)]
Fix bug
1937431.
Shorten cut-off location permission string.