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.
Merge commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp
* commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
Add Safety information to Settings > About Phone
The Safety information link is stored in a system property, ro.url.safetylegal
If the phone has data connection, select "Safety information" menu will open the
Safety information link. If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.
Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a
Merge commit '22e186898e47cf35a49e73494bf11695c854d284' into eclair-plus-aosp
* commit '22e186898e47cf35a49e73494bf11695c854d284':
packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit 'e65c943f974966e21c6f18dc9a95107ea1f07631' into eclair-plus-aosp
* commit 'e65c943f974966e21c6f18dc9a95107ea1f07631':
New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178
Also fixes 2138367: Share with Google setting doesn't get updated on checking the setting
And 2098232: "Set unlock pattern" should be at the top of the section
Merge commit '0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0' into eclair-plus-aosp
* commit '0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0':
Search and rewrite some uses of select and disable for touch and use.
Merge commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc' into eclair-plus-aosp
* commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc':
Remove long animation setting (standard length is now longer).
Merge commit '9e7105108ba0aecc961b2ecc3003a57242c982bc' into eclair-plus-aosp
* commit '9e7105108ba0aecc961b2ecc3003a57242c982bc':
Change default filter to third party when launched via settings and all apps when launched via
* changes:
Change default filter to third party when launched via settings and all apps when launched via low storage. Update string name. fix padding for Force Stop button Change message when clearing application data.
Merge commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d' into eclair-plus-aosp
* commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d':
Fix the typo in phase2 options.
Merge commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1' into eclair-plus-aosp
* commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1':
Use new memory API; show memory used by bg and fg processes.
Merge commit '985f5efc8278e1a5c2170c3aba354a4c9367b741' into eclair-plus-aosp
* commit '985f5efc8278e1a5c2170c3aba354a4c9367b741':
Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Move Factory data reset to About phone.
Show input method when dialog to enter/edit new dictionary word is displayed.
Add title to Accessibility settings.
Add changes to have the ability to turn on and off the
automatic light sensing for the device. This is fully configurable
and is by default not present. Vendors should override the ALS setting
to enable the automatic lighting controls.
These changes will add a check box to the Brightness settings menu to give control
to the user to allow the device's display lighting to be controlled via the slide bar
or the auto lighting system.
If the user selects auto then the slide bar will become invisible. Manual mode
will present the slide bar to the user.
Change-Id: I512c9d5dd72ddd831b33eb8fcd4680e2fc7f786e
Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.
Merge commit 'cded847838c726342bfe56e69d417d160c73f212' into eclair-plus-aosp
* commit 'cded847838c726342bfe56e69d417d160c73f212':
Make running services show dependent processes.
