Carlos Valdivia
|
afc3276323
|
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 '4806e47d55ff4797ba2a93c1f94414219d5358cb':
|
2014-09-16 15:21:08 +00:00 |
|
Baligh Uddin
|
6849828060
|
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 '2dd62886faea7b923aa1abaf4e5e7b681c400ba7':
|
2014-09-16 15:21:08 +00:00 |
|
Dan Sandler
|
d446e4750a
|
am fecd8989: am 99e467a7: am e98bee54: am 1fb51987: Merge "Show a better list of apps." into lmp-dev
* commit 'fecd8989854aaf09fd5f761ac863e116534e9177':
|
2014-09-16 15:21:07 +00:00 |
|
Zoltan Szatmary-Ban
|
f51abf9a64
|
am bc8f3d08: am 118cf516: am 55cd479d: am cf911d10: Merge "Check for DeviceAdminInfo type before casting" into lmp-dev
* commit 'bc8f3d08d7572ebf51976806d7c1ad6f02cf3352':
|
2014-09-16 15:21:06 +00:00 |
|
Zoltan Szatmary-Ban
|
5b792c6b81
|
am 23496243: am b2259b3a: am b46eeeb7: am f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '2349624368f4e3fd1e2d6ec6fee2122354aa1a14':
|
2014-09-16 15:21:05 +00:00 |
|
Fabrice Di Meglio
|
5b871c7630
|
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 '88ff5747b67df59fd623b177a06bce86b5031fb8':
|
2014-09-16 15:21:04 +00:00 |
|
PauloftheWest
|
a90713df31
|
am 08455c57: am c1806600: am 23d0ac44: am b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '08455c5791f706f8d55cd08a96375a209597d5d5':
|
2014-09-16 15:21:03 +00:00 |
|
Jim Miller
|
c31f561581
|
am 0787af48: am 825eb63c: am f496ae94: am ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '0787af48c7efa96ba3fa5a44b8686428e9f020a6':
|
2014-09-16 15:21:02 +00:00 |
|
Baligh Uddin
|
abc05267d2
|
am c742cfc7: (-s ours) am 6f96fcc5: (-s ours) am 321b25a1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit 'c742cfc716bba4ee2bd6dbe62a42d182baa4b6bd':
Import translations. DO NOT MERGE
|
2014-09-16 15:21:01 +00:00 |
|
PauloftheWest
|
4e7ebb3326
|
am 52e19465: am 1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '52e1946554a45b6034bcf23ed46f3033fe843129':
|
2014-09-16 15:21:00 +00:00 |
|
John Spurlock
|
f4ca7697d8
|
am 315e0a4a: am 31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '315e0a4a9e0a87972f7e5e8e850a226bdf90d83a':
|
2014-09-16 15:20:59 +00:00 |
|
PauloftheWest
|
ab9fe9d3e6
|
am 4708092e: am 8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '4708092e4f1b9538ddd8e3fc797ad184eea78233':
|
2014-09-16 15:20:58 +00:00 |
|
Jason Monk
|
aef243e64e
|
am c80014fb: am 062f736c: Adding zen mode condition dialog
* commit 'c80014fbbbfbefaab96aeffd9dd585801bd8d0e9':
|
2014-09-16 15:20:57 +00:00 |
|
Fabrice Di Meglio
|
315ae7930d
|
am 743400b4: am 877fb7fb: Merge "Fix bug #17449527 On Profile info alert box, profile picture button is unlabeled in accessibility" into lmp-dev
* commit '743400b466ad6459fe01a35596bf7478695cee57':
|
2014-09-16 15:20:56 +00:00 |
|
John Spurlock
|
0c91e31da8
|
am 417b8261: am 1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '417b826176e1b88ef640518eaed639726a84e9ec':
|
2014-09-16 15:20:55 +00:00 |
|
John Spurlock
|
0ea17d3b05
|
am 0ed4f5b7: am cddb2954: Settings: Make downtime days scrollable.
* commit '0ed4f5b7b122f98a37c0cd1de0de9ccc55795a14':
|
2014-09-16 15:20:54 +00:00 |
|
Matthew Xie
|
1b80bbc7bb
|
am a5d4c1b2: am 72e5583d: Merge "Do not remove bonded devices from cached device list upon a device scan" into lmp-dev
* commit 'a5d4c1b2be158f08c0363dc7339d01b5845fd5bc':
|
2014-09-16 15:20:52 +00:00 |
|
Carlos Valdivia
|
418c900f94
|
am cece1cb2: am af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit 'cece1cb20899394cd1710f5d02aa7fdacedaf653':
|
2014-09-16 15:20:51 +00:00 |
|
Elliott Hughes
|
0541c7ab1b
|
am 6312a721: am a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '6312a72136458287c467a224bb6e19ac9eedb203':
|
2014-09-16 15:20:50 +00:00 |
|
Jorim Jaggi
|
8e73e6c436
|
am 723abba6: am b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '723abba6c5315390cfdada773987d9522b7b1038':
|
2014-09-16 15:20:48 +00:00 |
|
PauloftheWest
|
771fd894b7
|
am 56b3f338: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '56b3f338e7bc85d30f56eafce4d6d0dc2dd46e3b':
|
2014-09-15 23:56:07 +00:00 |
|
Amith Yamasani
|
9c5104e610
|
am b8931381: am 67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit 'b89313812dbefe68ac48b06e3ca9c603c42cae1c':
|
2014-09-15 23:56:06 +00:00 |
|
Adam Lesinski
|
53a09c2711
|
am 98739309: am 3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '98739309e15e1437f15d92872712fe05ba29a4dc':
|
2014-09-15 23:56:05 +00:00 |
|
PauloftheWest
|
c8733c8a18
|
am 4cf6dcf6: am 29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '4cf6dcf6aff003cc4d294275209cb3987c07775f':
|
2014-09-15 23:56:04 +00:00 |
|
Zoltan Szatmary-Ban
|
e692ec6a12
|
am dbcfc1b7: am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit 'dbcfc1b73678e53bf89d11c5c4fe47a74f4508a7':
|
2014-09-15 23:56:03 +00:00 |
|
Elliott Hughes
|
1625fd5ac9
|
am bce031b0: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit 'bce031b0ad16c0ba127627ca7231d872d23ce9c3':
|
2014-09-15 23:56:00 +00:00 |
|
PauloftheWest
|
45a14bb239
|
am 5dcec205: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '5dcec20557353a79aaa97e113583507b4f1a7433':
|
2014-09-15 23:55:59 +00:00 |
|
PauloftheWest
|
ca5ea573d7
|
am 91f76560: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit '91f76560f80f006ce704f80f21400d91ffe43e89':
|
2014-09-15 23:55:58 +00:00 |
|
PauloftheWest
|
644a9f8130
|
am 9128659b: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '9128659be872890927291c30df781d3522d34a1e':
|
2014-09-15 23:55:57 +00:00 |
|
Andres Morales
|
096efb6b67
|
am a40a9a90: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit 'a40a9a90b33fc3c51f08b03503354ab0e90ac0c2':
|
2014-09-15 23:55:51 +00:00 |
|
PauloftheWest
|
7ea894eada
|
am 5c86c955: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '5c86c9551388e85b172a8305a0e9dd79ef025785':
|
2014-09-15 23:55:50 +00:00 |
|
Alan Viverette
|
71135c4f10
|
am ce7c0337: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit 'ce7c0337202bbf063a50e6436c246b35949ae0c3':
|
2014-09-15 23:55:49 +00:00 |
|
vandwalle
|
665bf2bf6a
|
am 4d5ddf0c: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '4d5ddf0cce5cd5cafb5b23e3289a279c7540abca':
|
2014-09-15 23:55:48 +00:00 |
|
Alexandra Gherghina
|
d2288753e1
|
am c210a3f2: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
* commit 'c210a3f2c645ead7dee4c76662dc0da14ffb0bc1':
|
2014-09-15 23:55:47 +00:00 |
|
Carlos Valdivia
|
88c24fe1fb
|
am b38b1b9e: am 690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
* commit 'b38b1b9ed63ed11ad845551300b0e48720dec843':
|
2014-09-15 23:55:46 +00:00 |
|
Jim Miller
|
12fb0406be
|
am 75c782bf: am 1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
* commit '75c782bf71057138375e5e11d815cde5c301e4de':
|
2014-09-15 23:55:45 +00:00 |
|
Alexandra Gherghina
|
14dfc45cdd
|
am ba89f50a: am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev
* commit 'ba89f50ae7bf52ac7307723257cea8a3114b1a51':
|
2014-09-15 23:55:44 +00:00 |
|
Alexandra Gherghina
|
b897f8c534
|
am 70ad4ffd: am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
* commit '70ad4ffd056c93338eb0e292fb6e675b40cb7434':
|
2014-09-15 23:55:43 +00:00 |
|
Amith Yamasani
|
e0313364bb
|
am 45308ef2: am 30c50b15: Use correct API for badging
* commit '45308ef25d6b10f0a96bb32bfca1bdc6bb63725d':
|
2014-09-15 23:55:42 +00:00 |
|
Fabrice Di Meglio
|
1f5bcc18d2
|
am 17f556c7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
* commit '17f556c7081e911268d5f9ed6bdc349b6ace6c65':
|
2014-09-15 23:55:41 +00:00 |
|
PauloftheWest
|
76ddec3185
|
am 5437b488: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
* commit '5437b488cb39538c2685013c0afc5ef798d3847e':
|
2014-09-15 23:55:40 +00:00 |
|
Barnaby James
|
a33056be9b
|
am 1299446d: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
* commit '1299446dee8d928ade9d3b7f2e433dbcf153551e':
|
2014-09-15 23:55:39 +00:00 |
|
Amith Yamasani
|
21980026de
|
am ba790ca3: am 91648629: Merge "Follow API change for method name" into lmp-dev
* commit 'ba790ca3aceb0be89e5b0142e6a871cf2b7e03a0':
|
2014-09-15 23:55:38 +00:00 |
|
Svetoslav
|
02afa3d95d
|
am 9b8912db: am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
* commit '9b8912dbee4b0acd6e7cfd8920e018695074a39e':
|
2014-09-15 23:55:37 +00:00 |
|
Svetoslav
|
3e11eddfe2
|
am 3c0385e4: am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev
* commit '3c0385e46506ecbd8694f10bc041c53695a9e8bb':
|
2014-09-15 23:55:36 +00:00 |
|
Jorim Jaggi
|
d832fa1589
|
am 60b7e882: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
* commit '60b7e88289651ce846e179f663964602f469f4b6':
|
2014-09-15 23:55:35 +00:00 |
|
Alexandra Gherghina
|
aab02b8673
|
am da1e8c75: am 51712241: Fix typo in intent filter
* commit 'da1e8c75fb15821e073e6da09e7b897616232b0d':
|
2014-09-15 23:55:34 +00:00 |
|
Alexandra Gherghina
|
f1f0b2567b
|
am 8378516b: am 9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
* commit '8378516b0bb4deefb68f30693f5bac2a3e1508ab':
|
2014-09-15 23:55:32 +00:00 |
|
Dan Sandler
|
d1234c882f
|
am 6f0507ad: am 8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.
* commit '6f0507add78fe79212b8408651be74e59f7c9dfa':
|
2014-09-15 23:55:32 +00:00 |
|
Wink Saville
|
91a69d353f
|
am 0e559d53: am aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
* commit '0e559d532c7cce810caa06ec6b69638e608b5998':
|
2014-09-15 23:55:31 +00:00 |
|