OSDN Git Service
The Android Automerger [Wed, 18 Apr 2012 14:04:51 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Jeff Brown [Tue, 17 Apr 2012 21:29:29 +0000 (14:29 -0700)]
Merge "Add label for default keyboard layout."
Jeff Brown [Tue, 17 Apr 2012 20:55:15 +0000 (13:55 -0700)]
Add label for default keyboard layout.
Bug:
6110399
Change-Id: I2431b99884cbd01de32f8cd6c14a3afbd18b5020
The Android Automerger [Tue, 17 Apr 2012 14:04:30 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Jake Hamby [Tue, 17 Apr 2012 01:10:33 +0000 (18:10 -0700)]
Merge "Remove "Searching/Tap To Pair" text from Bluetooth Settings."
Jake Hamby [Mon, 16 Apr 2012 23:30:14 +0000 (16:30 -0700)]
Remove "Searching/Tap To Pair" text from Bluetooth Settings.
The second text field next to "Available devices" in the Bluetooth
Settings device list creates a cluttered heading that wraps to multiple
lines in some locales. It's unnecessary because there's a graphical
progress spinner when searching for devices, and "Touch to pair" is
easily discoverable. Remove the second text field and the "Searching"
and "Touch to pair" string resources.
Bug:
5496221
Change-Id: I7b71222415152014426cf54fc112fe5379d350dc
Eric Fischer [Mon, 16 Apr 2012 21:40:19 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58fdf383ccd986cb56187d098365dab7b1ec4462
The Android Automerger [Mon, 16 Apr 2012 14:05:31 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Irfan Sheriff [Sat, 14 Apr 2012 05:12:57 +0000 (22:12 -0700)]
Merge "Wifi: Update message when scan result is empty"
Vishal Mahaveer [Mon, 9 Apr 2012 13:06:47 +0000 (08:06 -0500)]
Wifi: Update message when scan result is empty
Handle case when Wi-Fi scan result is empty
Change-Id: I03ccbf2603367efa3c6dfe20514e8c7c5a68b5d9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Jeff Brown [Sat, 14 Apr 2012 03:40:06 +0000 (20:40 -0700)]
Merge "Add setting to redirect vibrator to game controller."
Jeff Brown [Sat, 14 Apr 2012 03:31:37 +0000 (20:31 -0700)]
Merge "Use new input device listener API to refresh keyboards."
Jeff Brown [Sat, 14 Apr 2012 03:27:45 +0000 (20:27 -0700)]
Add setting to redirect vibrator to game controller.
Bug:
6334179
Change-Id: I62c9c163aa4ee2c88286daee77641418869a1dab
Jeff Sharkey [Sat, 14 Apr 2012 03:16:00 +0000 (20:16 -0700)]
Merge "Show data restricted apps, unify strings."
Jeff Sharkey [Fri, 13 Apr 2012 23:04:07 +0000 (16:04 -0700)]
Show data restricted apps, unify strings.
Always show apps with background data restricted, even when not
used in selected time period. Combine measurement disclaimer into
single string, and only show for mobile networks. Unify limit
dialog string.
Bug:
6007276,
5505010,
5495020,
5456087
Change-Id: I0ec307b330838dc9528d7e63e0ac1edd14ba122c
Jeff Brown [Sat, 14 Apr 2012 01:04:23 +0000 (18:04 -0700)]
Use new input device listener API to refresh keyboards.
Bug:
6110399
Change-Id: Ibb0bbeb40af2ee7204e4682bc7493262407fd83f
Eric Fischer [Sat, 14 Apr 2012 00:29:02 +0000 (17:29 -0700)]
am
dad12ddb: (-s ours) am
6ce339f6: Import translations. DO NOT MERGE
* commit '
dad12ddbe6425b031002c2f2e646f78789de36ac':
Import translations. DO NOT MERGE
Eric Fischer [Sat, 14 Apr 2012 00:26:34 +0000 (17:26 -0700)]
am
6ce339f6: Import translations. DO NOT MERGE
* commit '
6ce339f6788a8e95c6e412e1704499b4ba15dcf2':
Import translations. DO NOT MERGE
Eric Fischer [Sat, 14 Apr 2012 00:25:45 +0000 (17:25 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Sat, 14 Apr 2012 00:25:43 +0000 (17:25 -0700)]
am
ee365b41: (-s ours) Import translations. DO NOT MERGE
* commit '
ee365b411d98aa693506e88f2d73ebf09e81d098':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 13 Apr 2012 21:00:36 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1addf893fc64101dca482c89e2b0e286f679d7bf
Eric Fischer [Fri, 13 Apr 2012 20:58:45 +0000 (13:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I88661d0e666de6dca93aa2b55dd1ecd38040b7b3
Eric Fischer [Fri, 13 Apr 2012 20:56:55 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a7ab730f6d513c7a32e84a3536d8aa1dbd010bd
Jeff Sharkey [Fri, 13 Apr 2012 17:42:37 +0000 (10:42 -0700)]
Merge "Handle READ_EXTERNAL enforced by default."
Jeff Sharkey [Thu, 12 Apr 2012 22:58:57 +0000 (15:58 -0700)]
Handle READ_EXTERNAL enforced by default.
Bug:
6131916
Change-Id: Icbdaf6c7febfb8f93992a1f32732d104c8c1848c
Svetoslav Ganov [Fri, 13 Apr 2012 02:37:58 +0000 (19:37 -0700)]
Adding Text-To-Speech under Accessibility.
1. Adding text to speech (TTS) settings link under accessibility since
the TTS settings are buried under language and input, therefore it is
hard to find for a blind user. Note that TTS settings are some of the most
important for a visually impaired user.
bug:
5713535
Change-Id: I60aed1aeec5d40aa633dbac6e6149ad12366e9e6
The Android Automerger [Thu, 12 Apr 2012 14:05:02 +0000 (07:05 -0700)]
merge in jb-release history after reset to master
Jeff Sharkey [Wed, 11 Apr 2012 18:03:25 +0000 (11:03 -0700)]
Hide body immediately when no tabs.
Also check for valid SIM card when checking 4G radio status.
Bug:
6311752
Change-Id: Ic148f052429cc66bb51237bdc93c09f7c8ba3df1
Eric Fischer [Wed, 11 Apr 2012 21:06:11 +0000 (14:06 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Wed, 11 Apr 2012 20:56:16 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9259a45cd35d2404b4a4111092e62e0d20bf0ec9
Jeff Sharkey [Wed, 11 Apr 2012 18:04:00 +0000 (11:04 -0700)]
Merge "Hide body immediately when no tabs."
Jeff Sharkey [Wed, 11 Apr 2012 18:03:25 +0000 (11:03 -0700)]
Hide body immediately when no tabs.
Also check for valid SIM card when checking 4G radio status.
Bug:
6311752
Change-Id: Ic148f052429cc66bb51237bdc93c09f7c8ba3df1
The Android Automerger [Wed, 11 Apr 2012 14:06:50 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Jeff Brown [Mon, 9 Apr 2012 20:24:34 +0000 (13:24 -0700)]
Update use of input manager API in settings.
Change-Id: I7aa033df8b5eec69cc6002b0bcc20b1d9902e4e0
Eric Fischer [Tue, 10 Apr 2012 22:13:44 +0000 (15:13 -0700)]
am
13741f2f: (-s ours) Import translations. DO NOT MERGE
* commit '
13741f2fa6f950f718b60077c32c4b88025d9a22':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 10 Apr 2012 21:38:57 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia88d79197d3af7e2bc17e42c5717de7fb74de306
Eric Fischer [Tue, 10 Apr 2012 21:34:32 +0000 (14:34 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia2e68c14354bee036c6508af492e6a4eff376f17
The Android Automerger [Tue, 10 Apr 2012 14:06:28 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Daniel Sandler [Wed, 1 Feb 2012 19:14:18 +0000 (14:14 -0500)]
Update Settings for new Dreams architecture.
Additionally, hide all Dreams settings if the feature is
disabled (R.bool.config_enableDreams).
(Depends on change Idfe9d430)
Change-Id: Ifa05f125e411ca58605c33481de26cd29a926807
Eric Fischer [Mon, 9 Apr 2012 22:46:21 +0000 (15:46 -0700)]
Merge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 9 Apr 2012 22:02:34 +0000 (15:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icf78d443b9bd55cab09bead04c8046bcecab171d
Irfan Sheriff [Mon, 9 Apr 2012 21:29:14 +0000 (14:29 -0700)]
Merge "Add support for cancelling connection"
Jeff Sharkey [Mon, 9 Apr 2012 17:53:09 +0000 (10:53 -0700)]
Migrate to @Override to remove warnings.
Bug:
6303344
Change-Id: I8f17edc3b12d50cedab2c5f555c63bc07d85bca2
The Android Automerger [Mon, 9 Apr 2012 14:06:23 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Fri, 6 Apr 2012 23:42:13 +0000 (16:42 -0700)]
Merge "Import translations. DO NOT MERGE"
Irfan Sheriff [Fri, 6 Apr 2012 22:24:26 +0000 (15:24 -0700)]
Add support for cancelling connection
Change-Id: Iba4a002ab86e62d87ae1175b75c203d3a86ad7c6
Eric Fischer [Fri, 6 Apr 2012 21:08:15 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8bdd165249129d85855fc43b738fb970f132ce8b
Jeff Sharkey [Fri, 6 Apr 2012 20:40:45 +0000 (13:40 -0700)]
Merge "Move to INetworkStatsSession with lifecycle."
Amith Yamasani [Fri, 6 Apr 2012 19:00:01 +0000 (12:00 -0700)]
Merge "Update strings and character limits for some new strings"
Amith Yamasani [Thu, 29 Mar 2012 03:38:06 +0000 (20:38 -0700)]
Update strings and character limits for some new strings
Bug:
6243599
Bug:
6247318
Change-Id: Iaab4f6a2b55b7ee18804a3dcf8a0d00e67627e57
Jeff Sharkey [Fri, 6 Apr 2012 18:21:28 +0000 (11:21 -0700)]
Move to INetworkStatsSession with lifecycle.
Explicitly communicate lifecycle, enabling system_server to cache
stats when actively being used.
Bug:
6236498
Change-Id: Ieecc4b1d4fd46aeb5207c4ba9b450e04e9438d00
Jeff Brown [Fri, 6 Apr 2012 02:34:58 +0000 (19:34 -0700)]
Merge "Use new input manager API."
Jeff Brown [Fri, 6 Apr 2012 01:50:14 +0000 (18:50 -0700)]
Use new input manager API.
Bug:
6110399
Change-Id: I13f23b5d0aa5dc461a135303fc47432a6d57cbb4
Jean Chalard [Fri, 6 Apr 2012 01:18:49 +0000 (18:18 -0700)]
Merge "Update the delete asset with a more modern one."
Adam Powell [Thu, 5 Apr 2012 23:24:19 +0000 (16:24 -0700)]
Merge "Specify up navigation behavior"
Jeff Sharkey [Thu, 5 Apr 2012 23:18:00 +0000 (16:18 -0700)]
Merge "Controls to set expensive (metered) networks."
Adam Powell [Tue, 27 Mar 2012 00:28:38 +0000 (17:28 -0700)]
Specify up navigation behavior
Don't use the split action bar for manage apps
Change-Id: I5587b8efe63858c4cb38197391245740c2a055ac
Eric Fischer [Thu, 5 Apr 2012 23:01:10 +0000 (16:01 -0700)]
am
a3b3f7e8: (-s ours) am
d52d02bf: Import translations. DO NOT MERGE
* commit '
a3b3f7e8c11bc6da7c42afac06ebd70cc8b093db':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 5 Apr 2012 22:58:26 +0000 (15:58 -0700)]
am
d52d02bf: Import translations. DO NOT MERGE
* commit '
d52d02bf5fee5ab902fd46f069b3e4e1691f804d':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 5 Apr 2012 22:55:39 +0000 (15:55 -0700)]
Merge "Import translations. DO NOT MERGE"
Jeff Brown [Thu, 5 Apr 2012 22:29:37 +0000 (15:29 -0700)]
Merge "Add new settings UI to select keyboard layout."
Eric Fischer [Thu, 5 Apr 2012 22:25:01 +0000 (15:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib2b5e77f887d3e650b93c336303d43110a031740
Eric Fischer [Thu, 5 Apr 2012 22:22:58 +0000 (15:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8302ec88e121e98ad9e576fa8b8e86fa769701f7
Amith Yamasani [Thu, 5 Apr 2012 21:59:37 +0000 (14:59 -0700)]
Merge "Enable lockscreen configuration for secondary users."
Amith Yamasani [Thu, 5 Apr 2012 21:44:48 +0000 (14:44 -0700)]
Enable lockscreen configuration for secondary users.
Change-Id: Ifa67583ceaeb0739b448e5be93889c3f6f9474ed
Jeff Brown [Thu, 5 Apr 2012 18:42:18 +0000 (11:42 -0700)]
Add new settings UI to select keyboard layout.
Bug:
6110399
Change-Id: Ib2758bdcdd6b271be402f46c56d41619dc7aecb9
Jeff Sharkey [Wed, 4 Apr 2012 04:13:25 +0000 (21:13 -0700)]
Controls to set expensive (metered) networks.
Add UI to change metered flag on NetworkPolicy, and support Wi-Fi
policies per-SSID. Create Wi-Fi policies as needed, but leave cycle
undefined.
Only show and mutate mobile policies when SIM state is ready.
Bug:
3001465,
3291052
Change-Id: I481a202fe0e68fc2f5adfd3b3a6f40347d2b168c
Jeff Brown [Thu, 5 Apr 2012 17:34:57 +0000 (10:34 -0700)]
Remove unused layout file.
Change-Id: I93a08085ab4e2f098dcbf1199fef9315dcbeb238
Jean Chalard [Thu, 5 Apr 2012 12:29:48 +0000 (21:29 +0900)]
Update the delete asset with a more modern one.
Bug:
6026080
Change-Id: I5c42be50ca87b841bcf001360eb1f2ba461b7374
The Android Automerger [Wed, 4 Apr 2012 14:06:31 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Vikram Aggarwal [Mon, 2 Apr 2012 20:36:35 +0000 (13:36 -0700)]
Fix crash due to lost activity.
Change-Id: I9d0c2941bf3d725c506b15a738e6ab41678d76d1
The Android Automerger [Mon, 2 Apr 2012 14:06:08 +0000 (07:06 -0700)]
merge in jb-release history after reset to master
Eric Fischer [Sat, 31 Mar 2012 03:05:19 +0000 (20:05 -0700)]
am
5797c502: (-s ours) am
ca0d6822: Import translations. DO NOT MERGE
* commit '
5797c5023f940b6518b24ddb7a76591c936899af':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 30 Mar 2012 21:57:34 +0000 (14:57 -0700)]
am
ca0d6822: Import translations. DO NOT MERGE
* commit '
ca0d6822f163d8478cbf02a11d5d136e0e3f25c3':
Import translations. DO NOT MERGE
Eric Fischer [Fri, 30 Mar 2012 21:53:20 +0000 (14:53 -0700)]
Merge "Import translations. DO NOT MERGE"
Svetoslav Ganov [Fri, 30 Mar 2012 21:24:14 +0000 (14:24 -0700)]
Merge "Changed text for "accessibility script injection" preference."
Eric Fischer [Fri, 30 Mar 2012 21:02:40 +0000 (14:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebffa3155bcaa07e35790b5f09f3a4c309ea4351
Eric Fischer [Fri, 30 Mar 2012 21:00:32 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6a07131c3025acbb574d3add8ead6f272fd0d942
alanv [Fri, 30 Mar 2012 20:42:37 +0000 (13:42 -0700)]
Changed text for "accessibility script injection" preference.
Change-Id: I8afc786f47b88bde3212f38683c813771e70af6b
Vikram Aggarwal [Thu, 29 Mar 2012 21:07:22 +0000 (14:07 -0700)]
Minor changes to improve CryptKeeper readability
Change-Id: I8a056216edf7f557c32bdec9387b0d31de7aa6c6
Eric Fischer [Fri, 30 Mar 2012 16:29:59 +0000 (09:29 -0700)]
am
f8512644: (-s ours) am
841ad7ba: Import translations. DO NOT MERGE
* commit '
f85126443db3760a994edeb2cb595ff6de0e0a8f':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 29 Mar 2012 21:31:58 +0000 (14:31 -0700)]
am
841ad7ba: Import translations. DO NOT MERGE
* commit '
841ad7ba7f71589f9ca976a5b5b8535e3458a810':
Import translations. DO NOT MERGE
Eric Fischer [Thu, 29 Mar 2012 21:15:02 +0000 (14:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iea14f3c10b2730b43740e4fa73eba834699c1c6c
Eric Fischer [Thu, 29 Mar 2012 21:13:01 +0000 (14:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5db9914730e86cd35b9098780e66c472c84aeadb
Irfan Sheriff [Thu, 29 Mar 2012 15:41:25 +0000 (08:41 -0700)]
Merge "Fix discovery state tracking"
The Android Automerger [Thu, 29 Mar 2012 15:18:42 +0000 (08:18 -0700)]
merge in jb-release history after reset to master
Amith Yamasani [Wed, 28 Mar 2012 23:12:59 +0000 (16:12 -0700)]
Merge "Only enable multi-user settings if a secure settings flag is set"
Irfan Sheriff [Wed, 28 Mar 2012 22:55:20 +0000 (15:55 -0700)]
Fix discovery state tracking
Use the new intent to track if we are in discovery state
Change-Id: I9e07c3ccfcf62c3c33195d23c94de60d4248670c
Eric Fischer [Wed, 28 Mar 2012 20:44:40 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I50a666daa881741b7d5cbbb904ddd2d7c68e9771
Amith Yamasani [Wed, 28 Mar 2012 17:25:08 +0000 (10:25 -0700)]
Only enable multi-user settings if a secure settings flag is set
Use a secure settings key of "multiuser_enabled" that can be
set to "1" to enable the multiuser panel in Settings.
Change-Id: I37d96f6055bc7f87ef271ebdc58f16e7dcecca7b
The Android Automerger [Wed, 28 Mar 2012 14:04:51 +0000 (07:04 -0700)]
merge in jb-release history after reset to master
Kenny Root [Wed, 28 Mar 2012 03:41:49 +0000 (20:41 -0700)]
Merge "Convert to new KeyStore format"
Kenny Root [Wed, 28 Mar 2012 03:41:40 +0000 (20:41 -0700)]
Merge "Update Wifi to use new keystore function"
Kenny Root [Wed, 28 Mar 2012 03:41:34 +0000 (20:41 -0700)]
Merge "Switch VPN to use keystore ENGINE"
Eric Fischer [Tue, 27 Mar 2012 23:33:37 +0000 (16:33 -0700)]
am
fe8b3e9a: (-s ours) am
f4ce8c93: Import translations. DO NOT MERGE
* commit '
fe8b3e9a6062411d9ce7c97c1499915e5afb9dfb':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 27 Mar 2012 23:31:31 +0000 (16:31 -0700)]
am
f4ce8c93: Import translations. DO NOT MERGE
* commit '
f4ce8c937ea54fbee1fe38f858fc065d78c57214':
Import translations. DO NOT MERGE
Eric Fischer [Tue, 27 Mar 2012 23:30:54 +0000 (16:30 -0700)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Tue, 27 Mar 2012 21:29:58 +0000 (14:29 -0700)]
Merge "User management screens"
Eric Fischer [Tue, 27 Mar 2012 20:32:03 +0000 (13:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85c61b813ff4e4d9dd7cc1d2e3c49187b3d104d6
Eric Fischer [Tue, 27 Mar 2012 20:30:09 +0000 (13:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: I554653297cd9a1e29ce0daf1997874f33d1bb7e1