* resume credential storage settings in onResume() in case if a new
activity changes the settings and switches back.
* reset mRetry in case the dialog is retried and canceled.
* update preferences in onDismiss handler in case the dialog is canceled
and need to revert the checkbox.
Merge commit 'be699645dbae746c431caf9c0736938c55fda588' into eclair-plus-aosp
* commit 'be699645dbae746c431caf9c0736938c55fda588':
Fix for 2137900: Be more conservative about poking the wakelock
Merge commit 'd7705d4cd710ad93954acbffa464f9c96bf33809' into eclair-plus-aosp
* commit 'd7705d4cd710ad93954acbffa464f9c96bf33809':
Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
Merge commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10'
* commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Merge commit 'b20be6e24a7b546e413a00c51f8079fa7233651b'
* commit 'b20be6e24a7b546e413a00c51f8079fa7233651b':
Rename empty view so that the standard list view implementation
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 '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74' into eclair-plus-aosp
* commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74':
Rename empty view so that the standard list view implementation
* changes:
Rename empty view so that the standard list view implementation displays empty list message when list goes empty. Ideally the list is not empty for running processes and All filter options. so the message is just set to third party apps Remove the empty list view logic from code base
Merge commit '5928da682a31f3375a206d551c478d76437bb7cf' into eclair-plus-aosp
* commit '5928da682a31f3375a206d551c478d76437bb7cf':
Fix power widget brightness for Sholes.
displays empty list message when list goes empty. Ideally the list is
not empty for running processes and All filter options. so the
message is just set to third party apps
Remove the empty list view logic from code base
Merge commit '57b49b70de0ec6ea7528b44c0b82594c804996b7'
* commit '57b49b70de0ec6ea7528b44c0b82594c804996b7':
Display cell location for CDMA in Phone info screen.
Merge commit 'afa9d6ea321228add087f753e1e2a3853150d56f' into eclair-plus-aosp
* commit 'afa9d6ea321228add087f753e1e2a3853150d56f':
Display cell location for CDMA in Phone info screen.
Merge commit 'b62f48c6d32f74d8683bc300332afd5635af143a'
* commit 'b62f48c6d32f74d8683bc300332afd5635af143a':
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
Merge commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7'
* commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7':
Add Safety information to Settings > About Phone
Merge commit '72233c9d02f27a21d03f8560cc50132168cf6464'
* commit '72233c9d02f27a21d03f8560cc50132168cf6464':
packages/apps/Setting: Make vkey button haptics part of global haptic setting
Merge commit 'a38a1a77ab36e6779790401c3a02604e428ac58b' into eclair-plus-aosp
* commit 'a38a1a77ab36e6779790401c3a02604e428ac58b':
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
* changes:
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.
