Merge commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b' into eclair-mr2-plus-aosp
* commit 'f20623b2b6f75ecbbe1ac5de4994dd2944083d7b':
Add saving/restoring state in CredentialInstaller and ...
Merge commit 'd7705d4cd710ad93954acbffa464f9c96bf33809' into eclair-plus-aosp
* commit 'd7705d4cd710ad93954acbffa464f9c96bf33809':
Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
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 'ec54997a04307887b709c607808dace00df2f138' into eclair-plus-aosp
* commit 'ec54997a04307887b709c607808dace00df2f138':
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
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 '031ba6a3648367d307596f11b94367e50651397b' into eclair-plus-aosp
* commit '031ba6a3648367d307596f11b94367e50651397b':
SecuritySettings: use Credentials instead of CertTool.
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.
Merge commit 'bb3343923c640461eecc4fac25f911224a16d056' into eclair-plus-aosp
* commit 'bb3343923c640461eecc4fac25f911224a16d056':
Fix string name for bluetooth pairing and fix NPE
Merge commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599' into eclair-plus-aosp
* commit '10d3cf5082edb42f196ce0d5ac77c7a12b959599':
Enable cert install from sdcard in Settings...
Merge commit 'cd03f5320d42290b1619933954a344b59dc55f4f' into eclair-plus-aosp
* commit 'cd03f5320d42290b1619933954a344b59dc55f4f':
Move backlight brightness from HardwareService to PowerManager
to prevent apps from changing the hardware behind its back.
Fixes b/2041941 Lock screen flashes the screen very bright before dimming
Change-Id: Ic4faa008357fd3d74225ba90f05801c5127fd8c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d' into eclair-plus-aosp
* commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d':
Update AndroidManifest.xml for new Intent locations.
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.
This will fix a regression since the recent BT API changes. The settings app
would have missed some Bluetooth events, especially pairing.
Change-Id: Ia5e6371279feb389578e798fe11f1c239a4aa17b
Merge commit '76315391f07d022e31c176633ae3aeaee5bb14ec' into eclair-plus-aosp
* commit '76315391f07d022e31c176633ae3aeaee5bb14ec':
Improve running services to services managed by the system.
Merge commit '684736a9d4cc044c6970411485f4c22d5d7e3b74' into eclair-plus-aosp
* commit '684736a9d4cc044c6970411485f4c22d5d7e3b74':
b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp
* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
New UI for viewing and stopping currently running services.
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
* 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.
- 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.
PATCH SET 2:
+ Add import com.android.settings.R
PATCH SET 3:
+ Remove @Override interface methods to be compilable by Java 1.5.
PATCH SET 4:
+ Add import android.net.vpn.VpnManager
PATCH SET 5:
+ Add license headers.
PATCH SET 6:
+ Remove Constant.java and move the constants to VpnSettings.
+ Make AuthenticationActor implement DialogInterface's handlers.
+ Remove trailing spaces.
PATCH SET 7:
+ Remove default username.
This widget allows uses to turn on/off bluetooth, wifi, gps, and sync,
and adjust brightness without going through the settings menu.
The widget provider updates the settings when the buttons are pressed.
The widget provider is also a receiver for events indicating that the
status was updated elsewhere and the buttons need to be changed.
