Commit Graph

6199 Commits

Author SHA1 Message Date
Eric Fischer
dbc7d9c7e5 Import translations. DO NOT MERGE
Change-Id: Ia88d79197d3af7e2bc17e42c5717de7fb74de306
2012-04-10 14:38:57 -07:00
Daniel Sandler
47c991f78c 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
2012-04-10 04:15:21 -04:00
Eric Fischer
c8732db7e5 Merge "Import translations. DO NOT MERGE" 2012-04-09 15:46:21 -07:00
Eric Fischer
2269c2d12b Import translations. DO NOT MERGE
Change-Id: Icf78d443b9bd55cab09bead04c8046bcecab171d
2012-04-09 15:02:34 -07:00
Irfan Sheriff
d723367a6b Merge "Add support for cancelling connection" 2012-04-09 14:29:14 -07:00
Jeff Sharkey
76c5ed4f35 Migrate to @Override to remove warnings.
Bug: 6303344

Change-Id: I8f17edc3b12d50cedab2c5f555c63bc07d85bca2
2012-04-09 10:57:29 -07:00
Eric Fischer
fac28c5010 Merge "Import translations. DO NOT MERGE" 2012-04-06 16:42:13 -07:00
Irfan Sheriff
c08caf7a33 Add support for cancelling connection
Change-Id: Iba4a002ab86e62d87ae1175b75c203d3a86ad7c6
2012-04-06 15:28:57 -07:00
Eric Fischer
7b778e558e Import translations. DO NOT MERGE
Change-Id: I8bdd165249129d85855fc43b738fb970f132ce8b
2012-04-06 14:08:15 -07:00
Jeff Sharkey
3d7355342a Merge "Move to INetworkStatsSession with lifecycle." 2012-04-06 13:40:45 -07:00
Amith Yamasani
96b5ce8419 Merge "Update strings and character limits for some new strings" 2012-04-06 12:00:01 -07:00
Amith Yamasani
86ad15e741 Update strings and character limits for some new strings
Bug: 6243599
Bug: 6247318
Change-Id: Iaab4f6a2b55b7ee18804a3dcf8a0d00e67627e57
2012-04-06 11:59:02 -07:00
Jeff Sharkey
08ce99e224 Move to INetworkStatsSession with lifecycle.
Explicitly communicate lifecycle, enabling system_server to cache
stats when actively being used.

Bug: 6236498
Change-Id: Ieecc4b1d4fd46aeb5207c4ba9b450e04e9438d00
2012-04-06 11:47:25 -07:00
Jeff Brown
11ca81e1f0 Merge "Use new input manager API." 2012-04-05 19:34:58 -07:00
Jeff Brown
b4765ac70d Use new input manager API.
Bug: 6110399
Change-Id: I13f23b5d0aa5dc461a135303fc47432a6d57cbb4
2012-04-05 18:50:14 -07:00
Jean Chalard
7719be16df Merge "Update the delete asset with a more modern one." 2012-04-05 18:18:49 -07:00
Adam Powell
c48bf55b28 Merge "Specify up navigation behavior" 2012-04-05 16:24:19 -07:00
Jeff Sharkey
f35dd41da2 Merge "Controls to set expensive (metered) networks." 2012-04-05 16:18:00 -07:00
Adam Powell
faba7e4d9f Specify up navigation behavior
Don't use the split action bar for manage apps

Change-Id: I5587b8efe63858c4cb38197391245740c2a055ac
2012-04-05 16:11:49 -07:00
Eric Fischer
0bcb7c1e06 am a3b3f7e8: (-s ours) am d52d02bf: Import translations. DO NOT MERGE
* commit 'a3b3f7e8c11bc6da7c42afac06ebd70cc8b093db':
  Import translations. DO NOT MERGE
2012-04-05 16:01:10 -07:00
Eric Fischer
a3b3f7e8c1 am d52d02bf: Import translations. DO NOT MERGE
* commit 'd52d02bf5fee5ab902fd46f069b3e4e1691f804d':
  Import translations. DO NOT MERGE
2012-04-05 15:58:26 -07:00
Eric Fischer
19dc6c5022 Merge "Import translations. DO NOT MERGE" 2012-04-05 15:55:39 -07:00
Jeff Brown
d92ebd183f Merge "Add new settings UI to select keyboard layout." 2012-04-05 15:29:37 -07:00
Eric Fischer
89543bc050 Import translations. DO NOT MERGE
Change-Id: Ib2b5e77f887d3e650b93c336303d43110a031740
2012-04-05 15:25:01 -07:00
Eric Fischer
d52d02bf5f Import translations. DO NOT MERGE
Change-Id: I8302ec88e121e98ad9e576fa8b8e86fa769701f7
2012-04-05 15:22:58 -07:00
Amith Yamasani
f9cab7716f Merge "Enable lockscreen configuration for secondary users." 2012-04-05 14:59:37 -07:00
Amith Yamasani
3deeeb74c4 Enable lockscreen configuration for secondary users.
Change-Id: Ifa67583ceaeb0739b448e5be93889c3f6f9474ed
2012-04-05 14:44:48 -07:00
Jeff Brown
e46c5f30ca Add new settings UI to select keyboard layout.
Bug: 6110399
Change-Id: Ib2758bdcdd6b271be402f46c56d41619dc7aecb9
2012-04-05 14:41:41 -07:00
Jeff Sharkey
313f7d8c57 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
2012-04-05 14:31:43 -07:00
Jeff Brown
c2584bff77 Remove unused layout file.
Change-Id: I93a08085ab4e2f098dcbf1199fef9315dcbeb238
2012-04-05 10:34:57 -07:00
Jean Chalard
89a99a17e9 Update the delete asset with a more modern one.
Bug: 6026080
Change-Id: I5c42be50ca87b841bcf001360eb1f2ba461b7374
2012-04-05 21:29:48 +09:00
Vikram Aggarwal
9f55ae2878 Fix crash due to lost activity.
Change-Id: I9d0c2941bf3d725c506b15a738e6ab41678d76d1
2012-04-02 13:36:35 -07:00
Eric Fischer
fe03081de3 am 5797c502: (-s ours) am ca0d6822: Import translations. DO NOT MERGE
* commit '5797c5023f940b6518b24ddb7a76591c936899af':
  Import translations. DO NOT MERGE
2012-03-30 20:05:19 -07:00
Eric Fischer
5797c5023f am ca0d6822: Import translations. DO NOT MERGE
* commit 'ca0d6822f163d8478cbf02a11d5d136e0e3f25c3':
  Import translations. DO NOT MERGE
2012-03-30 14:57:34 -07:00
Eric Fischer
e725821201 Merge "Import translations. DO NOT MERGE" 2012-03-30 14:53:20 -07:00
Svetoslav Ganov
427f3fe7d2 Merge "Changed text for "accessibility script injection" preference." 2012-03-30 14:24:14 -07:00
Eric Fischer
f5d3fa195e Import translations. DO NOT MERGE
Change-Id: Iebffa3155bcaa07e35790b5f09f3a4c309ea4351
2012-03-30 14:02:40 -07:00
Eric Fischer
ca0d6822f1 Import translations. DO NOT MERGE
Change-Id: I6a07131c3025acbb574d3add8ead6f272fd0d942
2012-03-30 14:00:32 -07:00
alanv
9d085307bb Changed text for "accessibility script injection" preference.
Change-Id: I8afc786f47b88bde3212f38683c813771e70af6b
2012-03-30 13:42:37 -07:00
Vikram Aggarwal
bfa3a64310 Minor changes to improve CryptKeeper readability
Change-Id: I8a056216edf7f557c32bdec9387b0d31de7aa6c6
2012-03-30 13:11:44 -07:00
Eric Fischer
8e871ad0e0 am f8512644: (-s ours) am 841ad7ba: Import translations. DO NOT MERGE
* commit 'f85126443db3760a994edeb2cb595ff6de0e0a8f':
  Import translations. DO NOT MERGE
2012-03-30 09:29:59 -07:00
Eric Fischer
f85126443d am 841ad7ba: Import translations. DO NOT MERGE
* commit '841ad7ba7f71589f9ca976a5b5b8535e3458a810':
  Import translations. DO NOT MERGE
2012-03-29 14:31:58 -07:00
Eric Fischer
da421562fd Import translations. DO NOT MERGE
Change-Id: Iea14f3c10b2730b43740e4fa73eba834699c1c6c
2012-03-29 14:15:02 -07:00
Eric Fischer
841ad7ba7f Import translations. DO NOT MERGE
Change-Id: I5db9914730e86cd35b9098780e66c472c84aeadb
2012-03-29 14:13:01 -07:00
Irfan Sheriff
93345aefa8 Merge "Fix discovery state tracking" 2012-03-29 08:41:25 -07:00
Amith Yamasani
9cc3e6fdd8 Merge "Only enable multi-user settings if a secure settings flag is set" 2012-03-28 16:12:59 -07:00
Irfan Sheriff
3a14bafcf6 Fix discovery state tracking
Use the new intent to track if we are in discovery state

Change-Id: I9e07c3ccfcf62c3c33195d23c94de60d4248670c
2012-03-28 15:55:20 -07:00
Eric Fischer
2eadb1f97e Import translations. DO NOT MERGE
Change-Id: I50a666daa881741b7d5cbbb904ddd2d7c68e9771
2012-03-28 13:44:40 -07:00
Amith Yamasani
fa3eea59e8 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
2012-03-28 10:25:08 -07:00
Kenny Root
d0c186dde0 Merge "Convert to new KeyStore format" 2012-03-27 20:41:49 -07:00