Commit Graph

16760 Commits

Author SHA1 Message Date
Vinit Deshpande
07f3cfbdb6 am 7ae64011: am 84912814: am 7aaccec0: am c471629c: am 0a11f605: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev
* commit '7ae64011ad9d0615f55e52cc6d13ed622bab173e':
2014-09-19 06:19:22 +00:00
Svetoslav
edeba266c2 am 3ade85ec: am 9af0fce6: am 536cb798: am 842e9d04: am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev
* commit '3ade85ec739837ec33c161968480ff5e7c4f8184':
2014-09-19 06:19:21 +00:00
Carlos Valdivia
91b00518c6 am afc32763: am 4806e47d: am 456fbe88: am a8627dd8: am f79797c8: am ea2fa0d9: am db591467: am 737d2d53: am 61ced6d4: am 01137c20: am 663b4e97: am 37b58a42: SECURITY: Don\'t pass a usable Pending Intent to 3rd parties.
* commit 'afc3276323cf572dabb0024a741b6c46a9d6cf37':
2014-09-19 06:19:19 +00:00
Baligh Uddin
baceb2b6f4 am 68498280: (-s ours) am 2dd62886: (-s ours) am f053f532: (-s ours) am a2e918af: (-s ours) am 9b45212b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '6849828060b7e34b56715e8657ddacf8f812d9de':
2014-09-19 06:19:18 +00:00
Dan Sandler
e9f080e5b1 am d446e475: am fecd8989: am 99e467a7: am e98bee54: am 1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit 'd446e4750aeaec25aa8deb98b0e0e3ef38f7765e':
2014-09-19 06:19:17 +00:00
Zoltan Szatmary-Ban
c5155ee936 am f51abf9a: am bc8f3d08: am 118cf516: am 55cd479d: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit 'f51abf9a6449cf83fa795c2b4ac10c165840853a':
2014-09-19 06:19:16 +00:00
Zoltan Szatmary-Ban
3eea8cc714 am 5b792c6b: am 23496243: am b2259b3a: am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '5b792c6b817f10151c380ae63ce7f3852096f159':
2014-09-19 06:19:15 +00:00
Fabrice Di Meglio
1fc61ebe86 am 5b871c76: am 88ff5747: am a2bba88b: am b88d24df: am f8310c18: Merge "Fix bug #17459965 Take photo for Profile twice leads to "A resource was acquired at attached stack trace but never released" into lmp-dev
* commit '5b871c7630f9a0536cb1208f38ca0d8e9b724f58':
2014-09-19 06:19:13 +00:00
PauloftheWest
381a3e276b am a90713df: am 08455c57: am c1806600: am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit 'a90713df317928c6ccae9b5e32853a277e5ccc01':
2014-09-19 06:19:12 +00:00
Jim Miller
8b928d50ac am c31f5615: am 0787af48: am 825eb63c: am f496ae94: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit 'c31f5615815d7a7dce7e6045f8db7d1cb1adefd4':
2014-09-19 06:19:11 +00:00
Baligh Uddin
b1d81fc0fe am abc05267: (-s ours) am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'abc05267d2a7abc49092d06195e507aa3d6207b5':
  Import translations. DO NOT MERGE
2014-09-19 06:19:10 +00:00
PauloftheWest
36c0302d99 am 4e7ebb33: am 52e19465: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '4e7ebb332654a24254e9f7d59c05e4de33ccfa3d':
2014-09-19 06:19:08 +00:00
John Spurlock
b44f179fdd am f4ca7697: am 315e0a4a: am 31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit 'f4ca7697d826ebb1ce640dfebace66706db6ac29':
2014-09-19 06:19:07 +00:00
PauloftheWest
0e693d08b9 am ab9fe9d3: am 4708092e: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit 'ab9fe9d3e63f749014fa68f1c9a93998032fe46c':
2014-09-19 06:19:05 +00:00
Jason Monk
f41500f613 am aef243e6: am c80014fb: am 062f736c: Adding zen mode condition dialog
* commit 'aef243e64efe54428f897c9ea46aaf5d36a9d58b':
2014-09-19 06:19:04 +00:00
Fabrice Di Meglio
3ce297dac6 am 315ae793: am 743400b4: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
* commit '315ae7930d6dc7f07c32e3025e61cfd34eca2887':
2014-09-19 06:19:03 +00:00
John Spurlock
40303e2dc3 am 0c91e31d: am 417b8261: am 1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '0c91e31da8e2ba0431939dcd023e7444e41abbf8':
2014-09-19 06:19:02 +00:00
John Spurlock
156f87ac15 am 0ea17d3b: am 0ed4f5b7: am cddb2954: Settings: Make downtime days scrollable.
* commit '0ea17d3b0510b78a2d06446ec136afde2c25ba4b':
2014-09-19 06:19:01 +00:00
Matthew Xie
947454d446 am 1b80bbc7: am a5d4c1b2: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
* commit '1b80bbc7bb4ae0ee932f257ca199d7545d247068':
2014-09-19 06:18:59 +00:00
Carlos Valdivia
5059087f95 am 418c900f: am cece1cb2: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit '418c900f9436b0812def6075e8ab7a102dd563ba':
2014-09-19 06:18:58 +00:00
Elliott Hughes
37237b91d3 am 0541c7ab: am 6312a721: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '0541c7ab1b1dbb561cd53e4e84b9ffbf14000acd':
2014-09-19 06:18:57 +00:00
Jorim Jaggi
67bff7ae18 am 8e73e6c4: am 723abba6: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '8e73e6c4360c42c2bd59f3ed93b1af5b517476eb':
2014-09-19 06:18:56 +00:00
PauloftheWest
cd10b66ead am 771fd894: am 56b3f338: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '771fd894b7ceff7b6c93157881fb7cacf138f478':
2014-09-19 04:46:58 +00:00
Amith Yamasani
2a18eacaae am 9c5104e6: am b8931381: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit '9c5104e610e6bb408899c0763fabec48ef6bfd07':
2014-09-19 04:46:58 +00:00
Adam Lesinski
1a8885f5ec am 53a09c27: am 98739309: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '53a09c27111f428aadaca57f4cf38525e02e79bf':
2014-09-19 04:46:56 +00:00
PauloftheWest
06dde7a852 am c8733c8a: am 4cf6dcf6: am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit 'c8733c8a187f37573973f6e65452084d28971dba':
2014-09-19 04:46:55 +00:00
Zoltan Szatmary-Ban
d51f4d55f3 am e692ec6a: am dbcfc1b7: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit 'e692ec6a12e82fe11af7f7956089265a6090699c':
2014-09-19 04:46:54 +00:00
Elliott Hughes
b1314700af am 1625fd5a: am bce031b0: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit '1625fd5ac92530ff99cd17542e9d2c9cc8bc7961':
2014-09-19 04:46:53 +00:00
PauloftheWest
fe48ef91ab am 45a14bb2: am 5dcec205: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '45a14bb2399deab02e0bcd6b24b059f47b682569':
2014-09-19 04:46:52 +00:00
PauloftheWest
75130bc4bd am ca5ea573: am 91f76560: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit 'ca5ea573d7cccb46f7066d8e24e0df9429f1bbde':
2014-09-19 04:46:51 +00:00
PauloftheWest
6b6c4b39dc am 644a9f81: am 9128659b: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '644a9f8130afa9f9b047a1e6f2c8fba8426f0582':
2014-09-19 04:46:50 +00:00
Andres Morales
fa6be7d39f am 096efb6b: am a40a9a90: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit '096efb6b6714a1e743ace52d6987be1cdc8c57d5':
2014-09-19 04:46:49 +00:00
PauloftheWest
281b5a52ed am 7ea894ea: am 5c86c955: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '7ea894eadacac2064b902ca0c9ae2c811bd569c9':
2014-09-19 04:46:48 +00:00
Alan Viverette
b22d5d043e am 71135c4f: am ce7c0337: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit '71135c4f100819d8faf4921614f4266f74dbd960':
2014-09-19 04:46:47 +00:00
vandwalle
7288074f01 am 665bf2bf: am 4d5ddf0c: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '665bf2bf6aa8d1ccddf5090475f795db816a926a':
2014-09-19 04:46:46 +00:00
Alexandra Gherghina
cf76d0f2e7 am d2288753: am c210a3f2: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
* commit 'd2288753e1e1b2fa78054b32421f85c003d5b673':
2014-09-19 04:46:45 +00:00
Carlos Valdivia
5e56990239 am 88c24fe1: am b38b1b9e: am 690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
* commit '88c24fe1fb48643bfc320b152d888cbc465c93ff':
2014-09-19 04:46:44 +00:00
Jim Miller
fc5bc4877d am 12fb0406: am 75c782bf: am 1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
* commit '12fb0406be5b0ca6c98b466a7af9b26e7c95e1c3':
2014-09-19 04:46:43 +00:00
Alexandra Gherghina
45b695b1ac am 14dfc45c: am ba89f50a: am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev
* commit '14dfc45cddea3ddd5fceda18f0d79c8ce5f3d3c2':
2014-09-19 04:46:42 +00:00
Alexandra Gherghina
60149c62f2 am b897f8c5: am 70ad4ffd: am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
* commit 'b897f8c534fc685eb5ed6fa0ca96c5d08d29b42f':
2014-09-19 04:46:41 +00:00
Amith Yamasani
8d524dbcea am e0313364: am 45308ef2: am 30c50b15: Use correct API for badging
* commit 'e0313364bb3906968c0e1bd2a384e388f32dd71c':
2014-09-19 04:46:39 +00:00
Fabrice Di Meglio
d5ee0c0ad8 am 1f5bcc18: am 17f556c7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
* commit '1f5bcc18d29fe9d74e43655bf6ed9c55ee5e9c8e':
2014-09-19 04:46:38 +00:00
PauloftheWest
ea8140ad16 am 76ddec31: am 5437b488: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
* commit '76ddec3185d21a3fa4d4fceba7eace2122f2a04e':
2014-09-19 04:46:35 +00:00
Barnaby James
1a4ad4623b am a33056be: am 1299446d: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
* commit 'a33056be9bc1456905a425942506f34b9f87708b':
2014-09-19 04:46:34 +00:00
Amith Yamasani
9d1941f2d7 am 21980026: am ba790ca3: am 91648629: Merge "Follow API change for method name" into lmp-dev
* commit '21980026de439e989564379b4eea8e2b882cf787':
2014-09-19 04:46:33 +00:00
Svetoslav
a720df288c am 02afa3d9: am 9b8912db: am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
* commit '02afa3d95d798618e86dc812c136df5eb372ab23':
2014-09-19 04:46:32 +00:00
Svetoslav
962481096e am 3e11eddf: am 3c0385e4: am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev
* commit '3e11eddfe2b6ad2d4848655bab30d9503aeee40b':
2014-09-19 04:46:31 +00:00
Jorim Jaggi
a0de6956ee am d832fa15: am 60b7e882: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
* commit 'd832fa1589b9cfca4e4f349a76dd9eec916ed8a6':
2014-09-19 04:46:30 +00:00
Alexandra Gherghina
c2cf632f47 am aab02b86: am da1e8c75: am 51712241: Fix typo in intent filter
* commit 'aab02b8673aee807acb3e1db6e71a3332ca1fb1d':
2014-09-19 04:46:28 +00:00
Alexandra Gherghina
25c4d4bfb4 am f1f0b256: am 8378516b: am 9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
* commit 'f1f0b2567b57721164799d9dcf235e1b45363999':
2014-09-19 04:46:27 +00:00