Merge commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8' into eclair-plus-aosp
* commit 'e2caf2eefe84418fb1390b24aa24d5ec021438a8':
Feature #2296147 Settings for Car/Desk Dock on certain devices
This inserts a launcher for the Dock settings dialog, if the
device supports it and is currently docked.
The menu item disappears if the phone is not docked in the car/desk dock.
Merge commit '379953def17d6aec7a07a01a7d337403c63bdf44' into eclair-mr2-plus-aosp
* commit '379953def17d6aec7a07a01a7d337403c63bdf44':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-mr2
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
Merge commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03' into eclair-plus-aosp
* commit '8f2fb65b360ebc7ed71ddbc884451536e5e99c03':
Setting in Sound & Display for trackball pulsing on notification. Bug #2238250
(Google's open source screen reader) if they go
to the Accessibility settings screen and do not
have any accessibility tools installed.
This is a fix for bug #2250279
Merge commit '554cd5eca37a1027bcd3d7cc024471ff1d0b9ac1' into eclair-mr2-plus-aosp
* commit '554cd5eca37a1027bcd3d7cc024471ff1d0b9ac1':
Fix misspellings in the Settings app.
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-mr2
* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-plus-aosp
* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
Fix misspellings in the Settings app.
Merge commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b' into eclair-mr2-plus-aosp
* commit 'dd1f7c9e64b9614f5fe3fff9edf4343ee82ab48b':
Add backup string for a platform setting to enable or disable
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-plus-aosp
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit '9d6be2baf517462d2cce818c21b25958a40e4f06' into eclair-mr2
* commit '9d6be2baf517462d2cce818c21b25958a40e4f06':
Add backup string for a platform setting to enable or disable
Merge commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e' into eclair-mr2-plus-aosp
* commit 'a8a974bd171ccbc3b35b18c3e73a23d22834d05e':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-mr2
* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for 1974140. Delete entry if not valid on hitting home.
Merge commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec' into eclair-plus-aosp
* commit 'dd45a47bde9cdb9c27cb3ac3529a34f9789782ec':
Fix for 1974140. Delete entry if not valid on hitting home.
If user doesn't enter an APN or name, then delete the entry on hitting home.
And if user has enough information but doesn't enter a name, then set the
name to "Untitled" to avoid blank APNs in the list.
Merge commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b' into eclair-mr2-plus-aosp
* commit 'a4ec838d12c94b7103a4b3882ecda4ba28f6567b':
Use consistent punctuation for the Chinese locale names.
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-mr2
* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Merge commit '760b45c2a688876b94383561163244de8086f1c6' into eclair-mr2-plus-aosp
* commit '760b45c2a688876b94383561163244de8086f1c6':
Add Authentication Type field to the APN settings.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-mr2
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Merge commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0' into eclair-plus-aosp
* commit 'e0711522bc5e7c62951b0e429c4b4550feeeabf0':
Use consistent punctuation for the Chinese locale names.
Merge commit '195bc43460967e57e4c1131ba156083a93e0e4e8' into eclair-plus-aosp
* commit '195bc43460967e57e4c1131ba156083a93e0e4e8':
Add Authentication Type field to the APN settings.
Merge commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be' into eclair-mr2-plus-aosp
* commit 'f0fed9dc8784f0635cd27c498beecc45e1f800be':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-mr2
* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for 2202408: Replace Never Timeout with 30 minutes
Merge commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50' into eclair-plus-aosp
* commit 'b3735744fdd78a2098853d58a1fef6c643e7cb50':
Fix for 2202408: Replace Never Timeout with 30 minutes
The extracted bits will move into the HTC vendor tree, and it (or
similar settings for other vendors) can be accessed via a generic
OEM_RADIO_INFO activity.
Addresses issue:
http://buganizer/issue?id=1645706
Change-Id: Iec5461bcb3e241a1230f5f6d53baa3bb838ff4a9
Merge commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b' into eclair-mr2-plus-aosp
* commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b':
Add saving/restoring state in CredentialInstaller and ...
A new field is going to be added to the APN editor.
Authentication type: 4 possible values - None, PAP, CHAP, PAP or CHAP
These strings are too technical for the end user, however these
fields will be pre-populated and the user would not have to change them.
Change-Id: I7df326722fc4aebfe68d2726e2695eda8ea798a9
Merge commit 'e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp
* commit 'e1089ad33896f4fe5b75e773813367d700773b6f':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
