Geoff Mendal
|
2ef9983d4e
|
am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours
automerge: 967c000 -s ours
* commit '967c000603e40704008a094cce3f3348acab7cf8':
Import translations. DO NOT MERGE
|
2014-10-27 21:36:10 +00:00 |
|
Geoff Mendal
|
134ed71ced
|
am 40f84ca0: (-s ours) Import translations. DO NOT MERGE
automerge: 9ab85cf -s ours
* commit '9ab85cf0e01e2a96637c8a786a8df5fc5e0ccc65':
Import translations. DO NOT MERGE
|
2014-10-27 21:35:59 +00:00 |
|
Geoff Mendal
|
8ceb0c97b0
|
am 1dc92b37: (-s ours) am bf9175c0: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '1dc92b37337d4ce956c530fd8bec3c324a356d8b':
|
2014-10-27 20:39:17 +00:00 |
|
Baligh Uddin
|
bc2e9d95f2
|
am 6e05caac: (-s ours) am 5b3f6a3a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '6e05caac2cd01479a284d5953658ef7f897715a7':
|
2014-10-27 20:39:16 +00:00 |
|
Jim Miller
|
4e3fd4fecd
|
am d4072bce: am cd8971a9: am aa037675: Fix bad string in EncryptionInterstitial
* commit 'd4072bce628f2f1ab5a370cb2d55507990c0fbeb':
|
2014-10-27 20:39:15 +00:00 |
|
Jim Miller
|
65bca9cc85
|
am d57be02a: am 7b13fe8f: am 47adff0a: Show warning dialog when Accessibility is enabled
* commit 'd57be02ad5170b563ca98b48deeec4eb94154080':
|
2014-10-27 20:39:14 +00:00 |
|
Jim Miller
|
42516e391c
|
am df99f650: am b72f97c0: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit 'df99f650bd768da5a5d1be2068dbd740d038b7f3':
|
2014-10-27 20:39:13 +00:00 |
|
Svetoslav
|
1bdba9928a
|
am 58d6b511: am fec94660: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit '58d6b511313d5c628ea685eab9a0c1dac8a4c1c1':
|
2014-10-27 20:39:12 +00:00 |
|
Amith Yamasani
|
9d7c9e751b
|
am 64aedae1: am 2ae9f8ab: am e52c159c: Fix some strings for the encryption stuff.
* commit '64aedae130f47bbc331fcab1652eef4ab747826e':
|
2014-10-27 20:39:11 +00:00 |
|
Jim Miller
|
52486884e0
|
am 7c618504: am 9a7f7a34: am 4f903c3e: Add strings for upcoming change.
* commit '7c6185041e1cef563dfd32d3df1228be71fa62ce':
|
2014-10-27 20:39:10 +00:00 |
|
Svetoslav
|
d46588ea62
|
am b1766368: am c8a1bb5a: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
* commit 'b1766368538cf428d69f20dd3b00e3efe2b54c8e':
|
2014-10-27 20:39:09 +00:00 |
|
Geoff Mendal
|
8b29391220
|
am 4402b047: (-s ours) am d33f7d6a: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '4402b04767b3ae014cbf930d4b7520490a4acfa1':
|
2014-10-27 20:39:07 +00:00 |
|
Jim Miller
|
d1d823cc03
|
am c65633eb: am 9afd56e0: am 46c7f6d6: Add a checkbox option to \'require password to decrypt\'
* commit 'c65633eb27e16010e366b09289e33df31855e374':
|
2014-10-27 20:39:06 +00:00 |
|
Fabrice Di Meglio
|
e959b4f7ad
|
am c4ea2969: am 84ff9901: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
* commit 'c4ea2969f62073a14eecab1bafb1306ffce2edd7':
|
2014-10-27 20:39:04 +00:00 |
|
Jason Monk
|
8bae1bb066
|
am ea9819f4: am 8b1fe3b8: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
* commit 'ea9819f4ad685318c694c8b3152b4e9ce1382595':
|
2014-10-27 20:39:03 +00:00 |
|
Andres Morales
|
149027e6bf
|
am db4c54b6: am 4a9b3cf5: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit 'db4c54b68f777438771cbf2887df03b3beab6e56':
|
2014-10-27 20:39:02 +00:00 |
|
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 |
|