Commit Graph

17154 Commits

Author SHA1 Message Date
Elliott Hughes
f9d6d29163 Use the StorageManager constant for the PatternVisible key.
Bug: 17659622
Change-Id: Ibd44f5c619f61764ef4e4a3447f241e2f73339b5
2014-10-02 13:29:58 -07:00
PauloftheWest
39c3e48639 am 0d903323: am 7d31d81c: am c744c448: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '0d903323d509613e8c5992f4bf8b0a3ed761ebe5':
  Fixed a Setting Bluetooth Airplane mode bug.
2014-10-02 12:40:12 +00:00
Alan Viverette
7d6343e57e am 63ba6643: am 68e3f05c: am 91f4e5a8: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '63ba6643fda639b588d4410e4de43659cf062b62':
  Ensure recycled APN preferences are updated to show radio button
2014-10-02 12:40:11 +00:00
Baligh Uddin
2855d2f9e1 am 51b5e2af: (-s ours) am cb6b336e: (-s ours) am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '51b5e2af70081ea2d2b70e05341b1cca79e6c5f0':
  Import translations. DO NOT MERGE
2014-10-02 12:40:10 +00:00
Baligh Uddin
1e1f52a17d am 8ea8cfab: (-s ours) am 48f0021c: (-s ours) am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '8ea8cfabf36f7fb59f4f3fc8c9437a3cde4b539e':
  Import translations. DO NOT MERGE
2014-10-02 12:40:09 +00:00
Hui Shu
6abc2c25b5 am e9a39e28: am 9184ed5c: am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit 'e9a39e28c21fe6b732e2af13a9c5a658954f749a':
  Remove WebView DRP Setting from Developer Settings
2014-10-02 12:40:08 +00:00
Baligh Uddin
e2f219e3b6 am fffdc1b7: (-s ours) am 8133d31b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'fffdc1b762df51f1d13717da914ae3380f8581e8':
  Import translations. DO NOT MERGE
2014-10-02 12:37:41 +00:00
Baligh Uddin
ac0d5d95a7 am d4936ba9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'd4936ba987bbd9ea1c6ef441bd9bce8d691e0145':
  Import translations. DO NOT MERGE
2014-10-02 12:37:34 +00:00
Zoltan Szatmary-Ban
e40a207b06 am 231c4a23: am b5550a65: am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '231c4a231531cadd451c3beeb360de4a72ad6ae2':
  Disambiguate categories in Settings > Trusted Credentials
2014-10-02 12:37:20 +00:00
Maurice Lam
ed5ab3e5d5 am a1ecc44f: am 492f8728: am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit 'a1ecc44fa8802c0a931aec833910d515c88928af':
  [WifiSetup] Update background texture
2014-10-02 12:37:19 +00:00
Svetoslav
4b2fc1adad am 7358b7d5: am e78840ff: am 42eff3b7: am 52448442: Use default encryption password if an accessibility service is enabled.
* commit '7358b7d56286d1896f833bbd9d970b83dfb5fed1':
  Use default encryption password if an accessibility service is enabled.
2014-10-02 12:37:18 +00:00
Fabrice Di Meglio
37d89ffb65 am 3d2441f7: am 3cc8fe3b: am 976aba99: am fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit '3d2441f7766fd28c0e08a28eaf0a4f9315533cf0':
  Update Settings App icons
2014-10-02 12:37:17 +00:00
PauloftheWest
544ed0ef8e am cd93da02: am 8506c378: am cc6736bf: am 29aab7a2: Fixed a Settings crash.
* commit 'cd93da0235c61061d1eb335783183766c484cab2':
  Fixed a Settings crash.
2014-10-02 12:37:16 +00:00
Baligh Uddin
7e09be1370 am 91b315c1: (-s ours) am 02e6f611: (-s ours) am 6cbdf17e: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '91b315c1d6afac99f51e58488a14d4a1d8498f3a':
  Import translations. DO NOT MERGE
2014-10-02 12:37:16 +00:00
PauloftheWest
2f11848cbf am db464694: am c4ef9bf8: am dc5f87ff: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit 'db46469432b67550b9b5968d7aa4004121332b0d':
  Fixed multiple MAP issues.
2014-10-02 12:37:16 +00:00
PauloftheWest
324f29c86d am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
  Fixed a Setting Bluetooth Airplane mode bug.
2014-10-01 22:38:25 +00:00
Alan Viverette
dc174c8593 am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '7a4d229d2dd958fe033c739785eae6728caa5184':
  Ensure recycled APN preferences are updated to show radio button
2014-10-01 22:38:05 +00:00
Baligh Uddin
ee3d7127cf am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9d4dc326d1988ef2760e9d0d31239e43801587e2':
  Import translations. DO NOT MERGE
2014-10-01 22:37:43 +00:00
Hui Shu
bbb8928a4f am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 22:37:18 +00:00
Zoltan Szatmary-Ban
9cb9286dc2 am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
  Disambiguate categories in Settings > Trusted Credentials
2014-10-01 22:36:15 +00:00
Maurice Lam
001d854068 am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit 'f7b567081ef5f4daafdf0b229793323751e0d764':
  [WifiSetup] Update background texture
2014-10-01 22:34:39 +00:00
PauloftheWest
0d903323d5 am 7d31d81c: am c744c448: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '7d31d81c85e05bdc852835cdfe6bfa715249ab3d':
  Fixed a Setting Bluetooth Airplane mode bug.
2014-10-01 22:31:00 +00:00
Alan Viverette
63ba6643fd am 68e3f05c: am 91f4e5a8: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '68e3f05cab5a567dc56b4801698a3d2d706efab7':
  Ensure recycled APN preferences are updated to show radio button
2014-10-01 22:30:54 +00:00
Baligh Uddin
51b5e2af70 am cb6b336e: (-s ours) am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'cb6b336ec2e0d90df9977993d351d372a5ace4d7':
  Import translations. DO NOT MERGE
2014-10-01 22:30:48 +00:00
Baligh Uddin
8ea8cfabf3 am 48f0021c: (-s ours) am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '48f0021cec8943c3027f41faff147b83ba6d991f':
  Import translations. DO NOT MERGE
2014-10-01 22:30:42 +00:00
Hui Shu
e9a39e28c2 am 9184ed5c: am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '9184ed5cb4ac66839515da9c0ae69b08a97a91ae':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 22:30:41 +00:00
PauloftheWest
7d31d81c85 am c744c448: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit 'c744c448e472a065c1fc96fd6a26e2d1e9fa5c6a':
  Fixed a Setting Bluetooth Airplane mode bug.
2014-10-01 22:18:00 +00:00
Alan Viverette
68e3f05cab am 91f4e5a8: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '91f4e5a8aff6266bcb9fb717f8bfc8a4323fc9cf':
  Ensure recycled APN preferences are updated to show radio button
2014-10-01 22:17:46 +00:00
Baligh Uddin
cb6b336ec2 am 299c6e12: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '299c6e127d5105890a963208a64309af42051b56':
  Import translations. DO NOT MERGE
2014-10-01 22:16:50 +00:00
Baligh Uddin
48f0021cec am 0905bb07: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '0905bb07fc7059afc567d03dbca7696604aee0e2':
  Import translations. DO NOT MERGE
2014-10-01 22:16:47 +00:00
Hui Shu
9184ed5cb4 am c1c9888d: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit 'c1c9888db4171a9db81345f428342ec838b5da99':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 22:15:49 +00:00
PauloftheWest
c744c448e4 am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3':
  Fixed a Setting Bluetooth Airplane mode bug.
2014-10-01 21:12:30 +00:00
PauloftheWest
59d33dbd25 Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev 2014-10-01 21:07:56 +00:00
Alan Viverette
91f4e5a8af am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit '7a4d229d2dd958fe033c739785eae6728caa5184':
  Ensure recycled APN preferences are updated to show radio button
2014-10-01 20:12:01 +00:00
Alan Viverette
7a4d229d2d Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev 2014-10-01 20:05:21 +00:00
Alan Viverette
3cf5d1ea71 Ensure recycled APN preferences are updated to show radio button
BUG: 17516352
Change-Id: I5da19b7c6d5a3ec03fe24f7bdfda656d6d616342
2014-10-01 12:43:10 -07:00
Baligh Uddin
fffdc1b762 am 8133d31b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '8133d31b5275c35dd078ec24f300863dc9ac706f':
  Import translations. DO NOT MERGE
2014-10-01 19:32:47 +00:00
Baligh Uddin
299c6e127d am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9d4dc326d1988ef2760e9d0d31239e43801587e2':
  Import translations. DO NOT MERGE
2014-10-01 19:32:32 +00:00
Baligh Uddin
0905bb07fc Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-01 19:29:16 +00:00
Baligh Uddin
d4936ba987 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-01 19:29:14 +00:00
Baligh Uddin
8133d31b52 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-01 19:29:12 +00:00
Baligh Uddin
9d4dc326d1 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-01 19:29:10 +00:00
Zoltan Szatmary-Ban
231c4a2315 am b5550a65: am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit 'b5550a65c089f230a58b636c9a55c61a054d169b':
  Disambiguate categories in Settings > Trusted Credentials
2014-10-01 18:56:50 +00:00
Hui Shu
c1c9888db4 am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit '905f9e2f90c886a8405e0cca8286cd3dd7f430e9':
  Remove WebView DRP Setting from Developer Settings
2014-10-01 18:32:04 +00:00
Hui Shu
905f9e2f90 Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev 2014-10-01 18:28:52 +00:00
Zoltan Szatmary-Ban
b5550a65c0 am 45f8ffa1: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit '45f8ffa1da2f5dc937ab47c5f6e097f1a2d06750':
  Disambiguate categories in Settings > Trusted Credentials
2014-10-01 17:20:47 +00:00
Zoltan Szatmary-Ban
45f8ffa1da am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit 'b0c216d3b95b3aa3a0a38ebde92ec19956598e9d':
  Disambiguate categories in Settings > Trusted Credentials
2014-10-01 17:02:07 +00:00
Zoltan Szatmary-Ban
b0c216d3b9 Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev 2014-10-01 15:48:00 +00:00
PauloftheWest
797fc45ff6 Fixed a Setting Bluetooth Airplane mode bug.
+ This patch moves the switch listeners from setup/teardown of the SwitchBar
to pause/resume of Bluetooth Settings.  This prevents Bluetooth from
receiving connect messages while Airplane mode is turning off Bluetooth
(which is what caused Bluetooth to re-enable.)

Bug: 17465951
Change-Id: I4d32fcf5bb3a2241ed03e2295c86390e15743954
2014-10-01 08:23:40 -07:00
Maurice Lam
a1ecc44fa8 am 492f8728: am 5fdb8fa4: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '492f87288699dbf8bb521c4160688b73d241d454':
  [WifiSetup] Update background texture
2014-10-01 15:19:17 +00:00