Merge commit '84c8c175c8ee797f61121211c3ef8638d127cdf6' into gingerbread-plus-aosp
* commit '84c8c175c8ee797f61121211c3ef8638d127cdf6':
Import revised translations. DO NOT MERGE
Merge commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2' into gingerbread-plus-aosp
* commit '6dc1bf84cf72dd72a2517878f6b280e8afdcf4c2':
Manage apps "on SD card" now shows all apps that can go on SD card.
Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp
* commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74':
Separate the Settings activity name into two different strings.
The German translators would like to be able to hyphenate the name
shown in the Launcher but to keep the name shown within the activity
as a single word.
Change-Id: I22402c41186fdcdaed2712933ddf0f215b3a3329
Merge commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3' into gingerbread-plus-aosp
* commit 'f20931bc564774bbcae5f1f5f7c9aa35f612dad3':
Import revised translations. DO NOT MERGE
Merge commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85' into gingerbread-plus-aosp
* commit 'a63b08d9c8ae698960e3da502046e0cd09bc0a85':
New assets for power widget: gps, sync
Attempt to connect to car/desk dock after pairing completes. This
fixes a bug where we didn't try to connect if we received the UUID
change intent before the bonding state change intent.
Change-Id: I7c12a4eb23d17d506e43a64bf2a3aa5241debcb9
Merge commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025' into gingerbread-plus-aosp
* commit 'd2c3f37fa445130c8cce0f16347d61f66b4b0025':
Revise the Language & keyboard settings layout.
Based on Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)
Heavily modified to remove dead code.
Change-Id: I9e5f0bf2d32105feff4d68f03adebe87d2e9d900
Make it so that the app's explanation comes before the list of possible
policies. This gives the app a chance to explain itself instead of having
the explanation hidden below the fold. To avoid situations in which one
bunch of text items can obscure the other, use an expandable/ellipsizable
TextView with an indicator image. This resolves b/2992594.
Change-Id: I0eb0d0c46bb4be2ec2e019d741915537e1fcc592
Merge commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130' into gingerbread-plus-aosp
* commit '0adb8460bcb736d67f87bf1b56150bfac9c9c130':
Modifying the ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS action handling to default to All Apps tab
Merge commit '54e21852f221c183eba12e1706650cdc7e0a395f' into gingerbread-plus-aosp
* commit '54e21852f221c183eba12e1706650cdc7e0a395f':
Trim unwanted whitespace from translations. DO NOT MERGE
Merge commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8' into gingerbread-plus-aosp
* commit 'f8093b330adf3f307b203fcc8b568ec7be9348b8':
Fix the indicators in the button bar. The middle ones were showing the left indicators incorrectly.
Earlier refactoring seems to have messed it up. Added a position value to the state trackers.
Bug: 2980926
Change-Id: I31df4b1ae0b835d801d67747154594299498c4cf
Merge commit '32d54b19367505547a67c2b717047fdab375db94' into gingerbread-plus-aosp
* commit '32d54b19367505547a67c2b717047fdab375db94':
Remove Search from the system Settings app DO NOT MERGE
Merge commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13' into gingerbread-plus-aosp
* commit '3f1ba01d552f03faeb1aa9796dce8d9bf66d8e13':
BT: The Phone doesn't "wake up" when trying to pair with it.
Merge commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8' into gingerbread-plus-aosp
* commit 'dd79a33ba53fec530094f4d2fe37f0538530d9f8':
Auto-connect Bluetooth device only when user initiates pairing.
Fix bug 2271901: do not auto-connect to services on a BT device
when pairing was initiated by the device (e.g. for OPP file transfer).
Also corrected some typos and removed an unneeded lock object in
LocalBluetoothManager (synchronize on .class object instead, like
android.bluetooth.BluetoothDevice.getService() does).
Change-Id: I121105c6eee2658129f6094786754bbc7932d324
Merge commit 'b2fa8719a483a3ab36a8d919641714551c470bb8' into gingerbread-plus-aosp
* commit 'b2fa8719a483a3ab36a8d919641714551c470bb8':
Import revised translations. DO NOT MERGE
