Commit Graph

18779 Commits

Author SHA1 Message Date
vandwalle
500d476be3 am 9ef77359: am 60790f7b: am 2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev
* commit '9ef7735987e35dc40474c8727aff6a0a68180ddf':
2014-10-27 20:39:01 +00:00
Geoff Mendal
c85c19f259 am 595c3349: (-s ours) am a9cd186c: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '595c3349d84473ebfb4883b1d346ac02300fd692':
2014-10-27 20:39:00 +00:00
John Spurlock
6da57cdaf0 am 590f44a2: am b3ce7874: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit '590f44a2df0f370d98134d0571763f9f8460b003':
2014-10-27 20:38:59 +00:00
Alan Viverette
e2c3da894d am 061c8b00: am 673e3c28: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '061c8b0011f433be0a2304f8cb7423e042905ec9':
2014-10-27 20:38:58 +00:00
Amit Mahajan
e1a5108d01 am b1d81165: am 6f451050: am 88b2790d: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
* commit 'b1d81165ceec380a5db553ff790730b51d8056f9':
2014-10-27 20:38:57 +00:00
Dianne Hackborn
c45b586c95 am 88f7a6a7: am df8683d2: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '88f7a6a7c138cfdc1a52e04ece136e039060970f':
2014-10-27 20:38:56 +00:00
Zoltan Szatmary-Ban
8cb271b1d2 am 21b3566d: am 4ce8802e: am 50263efb: Remove CA Cert UI item from one list only
* commit '21b3566dfb31288a2fe7e57cb6986afc17cfe643':
2014-10-27 20:38:55 +00:00
Amith Yamasani
79f9e58f63 am 69f5e5ed: am 195b1583: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
* commit '69f5e5ed63cbbed6cbb7c60714e28c324b2bcac0':
2014-10-27 20:38:54 +00:00
Geoff Mendal
d6c0ed5177 am 5af09c9d: (-s ours) am 185e1722: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
* commit '5af09c9d8e1583a1d0592ac8e53eb39e4ec91d7b':
2014-10-27 20:38:53 +00:00
Baligh Uddin
9dc831d77a am adcf72ab: (-s ours) am bbf9927b: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE
* commit 'adcf72abda4c2595110838fd1dfee83b65ea47e6':
2014-10-27 20:38:52 +00:00
Svetoslav
44e1536cea am f7b5f424: am b792f69e: am 5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit 'f7b5f424d58e5b6474929ce9bf75d22b8ed3b079':
2014-10-27 20:38:51 +00:00
John Spurlock
4a86b23fe0 am b96de5b0: am 041ebc1b: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit 'b96de5b088b1e30ee0dcc9bc2914e18d21e4ac93':
2014-10-27 20:38:50 +00:00
PauloftheWest
a002dc9b41 am 94841dc1: am d005440f: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit '94841dc1e5df150b63e4709758cbc022800ee8b3':
2014-10-27 20:38:49 +00:00
PauloftheWest
04533396c9 am 86ac419c: am 324f29c8: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '86ac419cad6ef4a8dfe751debf9404dce0e65209':
2014-10-27 20:38:48 +00:00
Alan Viverette
ac22c347f9 am ffac1ac9: am dc174c85: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit 'ffac1ac92f3da89b21b6370d6f657fba81415fbc':
2014-10-27 20:38:47 +00:00
Baligh Uddin
a2689db7f9 am 0627d066: (-s ours) am ee3d7127: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '0627d066ca3433b62e8f781dfedcf32d0742f1a8':
2014-10-27 20:38:45 +00:00
Hui Shu
fa098e64be am f3acb3ad: am bbb8928a: am 905f9e2f: Merge "Remove WebView DRP Setting from Developer Settings" into lmp-dev
* commit 'f3acb3ad2e13953186ae9a7697ed726feb106a9b':
2014-10-27 20:38:45 +00:00
Zoltan Szatmary-Ban
74dc5fb345 am b8acc5ac: am 9cb9286d: am b0c216d3: Merge "Disambiguate categories in Settings > Trusted Credentials" into lmp-dev
* commit 'b8acc5ac4d84368fb953b0ee7b29ed014cb67733':
2014-10-27 20:38:44 +00:00
Maurice Lam
9ccbca912c am 923ac8d1: am 001d8540: am f7b56708: Merge "[WifiSetup] Update background texture" into lmp-dev
* commit '923ac8d16a292e42289a41da3859763af0ca41f6':
2014-10-27 20:38:42 +00:00
Svetoslav
3e5a614472 am 8ecde61d: am 6b5b77d2: am 52448442: Use default encryption password if an accessibility service is enabled.
* commit '8ecde61de7181b69da4a9d022972fe4d1b4133ad':
2014-10-27 20:38:41 +00:00
Fabrice Di Meglio
ee17bcd2ad am ed27383a: am ca99afb5: am fc14e272: Merge "Update Settings App icons" into lmp-dev
* commit 'ed27383a9c256498ee5b3e4c44821329227ea657':
2014-10-27 20:38:40 +00:00
PauloftheWest
6f79a91764 am 6073d5b0: am c0d0a208: am 29aab7a2: Fixed a Settings crash.
* commit '6073d5b0d910a5fbbc4a6b5adbaf1200640f2fc4':
2014-10-27 20:38:39 +00:00
Baligh Uddin
3a9ae9f032 am 9e5d2e4a: (-s ours) am 08a08b34: (-s ours) am 5c664d8e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '9e5d2e4a0fc899e2720456866d1a215a8c4f147b':
2014-10-27 20:38:38 +00:00
PauloftheWest
24354b695d am b3047a47: am 6dfb48bf: am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev
* commit 'b3047a47050c62173e11c00bcd8ad76c5366567c':
2014-10-27 20:38:38 +00:00
Robert Greenwalt
e4075f60aa am 77ac3454: am 4670af53: am ce77a43a: Merge "ATT Entitlement changes in Settings to pass Tether Type." into lmp-dev
* commit '77ac34543123e162170a352a3a6efd3922a9f997':
2014-10-27 20:38:37 +00:00
Elliott Hughes
876689ad81 am 3bcf9e24: am c9482dd9: am ed6a6ca0: Make the system locale available to the decryption UI.
* commit '3bcf9e24e12f52379e1ef691fde1b3f5a65a02e3':
2014-10-27 20:38:36 +00:00
Alexandra Gherghina
c769627131 am 0f855e80: am e4b18b79: am 9de68440: Merge "Match parent width for user spinner to fix tint" into lmp-dev
* commit '0f855e806a4d01d2d5388e95d2aa8c0a81dc7583':
2014-10-27 20:38:35 +00:00
Alexandra Gherghina
b2f6f0f2c6 am 4f516ac6: am 8e4be6af: am 3c3ceb9d: Merge "Use plain user icon in UserSpinnerAdapter" into lmp-dev
* commit '4f516ac64597de6ff8f4accc8e4bb3a04e1315fe':
2014-10-27 20:38:34 +00:00
PauloftheWest
1e4b44d189 am 910a335b: am 2af51dbc: am 3aabfca4: Merge "Fixed a crash when rotating a WPS dialog." into lmp-dev
* commit '910a335b362664b7c1a88c87772d72b868b5b16b':
2014-10-27 20:38:33 +00:00
Michael Wright
616cf15939 am e696208d: am 2e0d4080: am 1b87bec5: Merge "If a device identifier is specified, bring up keyboard layouts dialog." into lmp-dev
* commit 'e696208d6119f591bf2136c3d232b6c0581e1bf0':
2014-10-27 20:38:32 +00:00
Zoltan Szatmary-Ban
4521251d99 am 08b3692c: am 2d9cbcea: am a2b7bb6b: Merge "Make Force Stop button work for packages of managed profile" into lmp-dev
* commit '08b3692cfd6d94944d99f19f1a5fd89839b18c55':
2014-10-27 20:38:30 +00:00
Zoltan Szatmary-Ban
2b3c8cc64d am 03049372: am 8812d973: am 7258650e: Merge "Start PowerUsageDetails fragment in the correct activity" into lmp-dev
* commit '030493728e49edd9dcf4e3ed00d638cf5d6f318c':
2014-10-27 20:38:29 +00:00
Alexandra Gherghina
de339d820e am f91fee3b: am 4bda5d6e: am eac7cc5e: Merge "Add null check for sync authorities of an account type" into lmp-dev
* commit 'f91fee3b8b0b5373c31e6b7623d96254f682d82d':
2014-10-27 20:38:28 +00:00
Jeff Sharkey
25cbb246af am 52ac1f48: am 7c8e4870: am d642d1ab: Merge "Include reason when wiping data." into lmp-dev
* commit '52ac1f48859db5bb7f43d17c7293aa5969e07994':
2014-10-27 20:38:27 +00:00
Paul Lawrence
ee6fec6560 am 5dc635be: am 7af02e13: am 29df3796: Merge "Hide controls once password is known good" into lmp-dev
* commit '5dc635be37840a789e8f91e2307a2de934b29951':
2014-10-27 20:38:26 +00:00
Adrian Roos
41f94193c7 am b1a06720: am 98d94401: am 6d5c75f6: Prevent saving credentials multiple times
* commit 'b1a06720eb314ab0a03f2bc5d968a2a034b97e95':
2014-10-27 20:38:25 +00:00
Alan Viverette
10b6ab18a1 am 60b2b075: am c0277ea2: am c394e380: am 3156e38f: Merge "Fix background colors to point directly to theme attribute" into lmp-dev
* commit '60b2b075d4bac086b91f18ebad1ab58cb956908c':
2014-10-27 20:38:24 +00:00
Fabrice Di Meglio
5ddd69fc7e am 58bb42f1: am 8c3f35a6: am 5fe578d8: am a1c6a0c8: Merge "Fix bug #17594602 Battery Usage refresh icon needs updating" into lmp-dev
* commit '58bb42f1d9b136cec69d411f0f875266cd09cb6d':
2014-10-27 20:38:23 +00:00
vandwalle
acaf68b35c am 18376c10: am 7cc43f77: am 0490e707: am 3962f171: Merge "correctly report DHCP failures" into lmp-dev
* commit '18376c10ff7d7b79c109c1fa57cc843ae63d9632':
2014-10-27 20:38:22 +00:00
Fabrice Di Meglio
f8e930c7bc am 77bbe567: am f931c6db: am b517f4c5: am 575a4d2a: Merge "Fix bug #17624121 Settings crash while launching on wiped device" into lmp-dev
* commit '77bbe567f5178a56f08139c1295c9984017437ad':
2014-10-27 20:38:21 +00:00
PauloftheWest
6181996202 am aca87588: am a50ef37d: am 34f78835: am 3b04714b: Merge "Fixed a Settings crash when exiting Wi-Fi Settings." into lmp-dev
* commit 'aca87588e1e9ea8fa8d44568d57833abe8c30ebd':
2014-10-27 20:38:20 +00:00
John Spurlock
12fc1c01a9 am e31575db: am 87fdccdc: am f1a24609: am 7e905488: Settings: Wire up new zen events config option.
* commit 'e31575db867c3074609dadda54656ca2a9514396':
2014-10-27 20:38:19 +00:00
Baligh Uddin
23ab692237 am 59231820: (-s ours) am f6cb6bab: (-s ours) am acbd8195: (-s ours) am 2bfd4a5f: (-s ours) Import translations. DO NOT MERGE
* commit '59231820ffac3e6ac18b5fd6a4b8e642f2721165':
2014-10-27 20:38:18 +00:00
PauloftheWest
2acd094dd9 am e8bdd136: am 6ff1b3d3: am c43b84e3: am 27dcfbbd: Merge "Fixed a Bluetooth discovery bug." into lmp-dev
* commit 'e8bdd136a6fa44425e267a9bb350eda15a206ad8':
2014-10-27 20:38:16 +00:00
PauloftheWest
dfb90f8421 am a5f72825: am 55d5d83f: am 8f771c1f: am 1977342e: Merge "Fixed Settings Cellular Networks crash." into lmp-dev
* commit 'a5f72825a8b27e82a118baa9fbc64e3797f4ac63':
2014-10-27 20:38:15 +00:00
Baligh Uddin
39a164333b am 76e39afa: (-s ours) am 85c06226: (-s ours) am 3cf09bfe: (-s ours) am f015d47c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '76e39afa5b73e2ee788cab947af447404419f723':
2014-10-27 20:38:14 +00:00
Svetoslav
7f1267cd64 am d4f7908a: am c269be39: am e7416dbe: am 1154caa8: Merge "Crash in Settings cancelling a print job from the job list." into lmp-dev
* commit 'd4f7908a9816ab6b8bb4e6b41643bb8a1475ff07':
2014-10-27 20:38:13 +00:00
Vinit Deshpande
cf1485e4e2 am 9ff006b4: am 33812f49: am 749c39f0: am 9a8c58d4: Merge "Fix automatic Wi-fi toggle" into lmp-dev
* commit '9ff006b42127175e3c40cbaafe09f3262f66f057':
2014-10-27 20:38:12 +00:00
Zoltan Szatmary-Ban
0dcda11f19 am ab36fd98: am f8935010: am ddcb808b: am 6e1d8277: Merge "Show Power usage details for the correct user" into lmp-dev
* commit 'ab36fd983d77bb018dcbcf1e548409416ec014a1':
2014-10-27 20:38:11 +00:00
Matthew Xie
82fd86aa66 am 631dd2ea: am 231a8128: am 68f3653e: am 72c34e6a: Merge "Do not overwrite alias with device name" into lmp-dev
* commit '631dd2ea58bbb1729b169ec66dfefa1cd3dcbdd6':
2014-10-27 20:38:10 +00:00