John Spurlock
|
caea99bc5f
|
am f1f11b5b: am 7cd016e3: am 7dfc3540: am 0f01eb7f: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit 'f1f11b5b25ceed85f74c6d64e91a870bf7a1592c':
|
2014-09-19 07:44:37 +00:00 |
|
PauloftheWest
|
301381b4f7
|
am f03f6ab3: am ed9fd0dd: am 01de9832: am b2737bc0: am 3cc81aea: Increase char limit for translation.
* commit 'f03f6ab3762611ee22b1dbb3dc6bb81379d8ac7e':
|
2014-09-19 07:43:56 +00:00 |
|
Maurice Lam
|
15268118df
|
am 5130a2e4: am 670e1e5e: am ac115451: am 7fc505a1: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '5130a2e4539e3fea3f13475cf92e94cd158fd0d5':
|
2014-09-19 07:35:49 +00:00 |
|
Baligh Uddin
|
5653e2543d
|
am 0bb9427b: (-s ours) am c6954436: (-s ours) am bbaad6b9: (-s ours) am 453053db: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '0bb9427b4a2fcb4af48067cb5e1161503fa28b16':
|
2014-09-19 07:35:48 +00:00 |
|
PauloftheWest
|
c0865057de
|
am 3244c683: am 2aed3a5e: am ebb04444: am 9e7073ae: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit '3244c683a2d0c4e50919ea2e8cd2857729897b5c':
|
2014-09-19 07:35:47 +00:00 |
|
Edward Jee
|
437a1ad0fb
|
am 96d840fc: am 78189c64: am a17545fa: am c64a51cb: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '96d840fc12d894ed6b2a96522e833e6ec7056dd6':
|
2014-09-19 07:35:46 +00:00 |
|
Edward Jee
|
b6b99d8377
|
am 3c4f081f: am 69010fb1: am ea9c43ca: am 299faadb: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit '3c4f081f590a5ff84a2820b013a5ee300dbfdc73':
|
2014-09-19 07:35:45 +00:00 |
|
PauloftheWest
|
803a742f50
|
am b268fad4: am 3724edb3: am f4713e0f: am 99f7d73b: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit 'b268fad47e6a1bd625ccb3b1f76577beee258895':
|
2014-09-19 07:35:44 +00:00 |
|
Dianne Hackborn
|
59637933b6
|
am cc9cacb5: am 4e2f9ca6: am 99b1261c: am 9e4b5269: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.
* commit 'cc9cacb5d480f532bfe003f9d8011cfbe2873267':
|
2014-09-19 07:35:43 +00:00 |
|
Dianne Hackborn
|
5e91d3d67c
|
am be46e2a4: am 5df5798e: am 6d9988e7: am ebcba9dc: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit 'be46e2a4bd339e37bd4d6d31408d459ec87872b5':
|
2014-09-19 07:35:42 +00:00 |
|
Maurice Lam
|
a9653f946e
|
am b3f7de50: am 9bfbf642: am 24956de0: am 95b283aa: am 795511ec: [WifiSetup] Disable app starting window
* commit 'b3f7de50ab806abb388b801e786208526a2f8730':
|
2014-09-19 07:35:40 +00:00 |
|
PauloftheWest
|
a6d64b372e
|
am effc8f52: am 9de624d8: am 7b03a452: am dc985292: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit 'effc8f52afba006682ddde5097b834a6245787b1':
|
2014-09-19 07:18:17 +00:00 |
|
Prem Kumar
|
5540b3e610
|
am 24bfab6f: am 02f66ba7: am 07e5ea99: am 319e7a27: am c0deb7da: Merge "Remove UI for Forget AP as a secondary user." into lmp-dev
* commit '24bfab6f23ef33ac3a8c31c0668642057f7cdc2b':
|
2014-09-19 06:52:17 +00:00 |
|
John Spurlock
|
c4dbed50ce
|
am 6770d063: am c9f6945f: am be0827dd: am f97ec546: am 2e205e9b: Merge "Settings: Use new PowerManager call to set low power mode." into lmp-dev
* commit '6770d06345d75d391b4708f0813c810b9749573b':
|
2014-09-19 06:52:16 +00:00 |
|
Tyler Gunn
|
cfb4709e2b
|
am 0c079321: am 2b3505ed: am 8bad5a2d: am 86e452f9: am 3e71b197: Renaming Telecomm to Telecom.
* commit '0c07932111b94cfcc0bceabce7fd3d77883717bc':
|
2014-09-19 06:52:15 +00:00 |
|
Paul Lawrence
|
530fe251ec
|
am 158a291f: am 36d8bd3b: am db51c76a: am 7f4c4fb5: am c64c9808: Merge "Prevent PIN/Passwword disappearing during boot" into lmp-dev
* commit '158a291f63c90d2979b1e7bffe40d0d29a38d366':
|
2014-09-19 06:20:04 +00:00 |
|
Kenny Guy
|
6ead5ba6d9
|
am 9d266fb8: am daa4a466: am 28d2fa62: am 1ede808c: am db9e3f68: Merge "Fix crash when showing accounts." into lmp-dev
* commit '9d266fb852343abd5d1ae2152eabb74c7421b545':
|
2014-09-19 06:20:03 +00:00 |
|
Alexandra Gherghina
|
739d6c7dca
|
am 60422087: am 7a09535c: am cd321d81: am 69af2c6a: am f738895d: Merge "Switch to using system-wide default user icons" into lmp-dev
* commit '60422087202bee68b6ffea07c8f1a4edc917cd33':
|
2014-09-19 06:20:02 +00:00 |
|
PauloftheWest
|
e9e3ce934a
|
am 8d8c5669: am e438c383: am 6c1d69ba: am 9f96ac6f: am 37b1253a: Merge "Fixed multiple Bluetooth Settings crashes." into lmp-dev
* commit '8d8c566934636bd946eec8b4182f0ed7d2a577ed':
|
2014-09-19 06:19:26 +00:00 |
|
Dianne Hackborn
|
5a6d466926
|
am 1d463fb1: am f7acc1b3: am c857cddf: am 364ca371: am a5780340: Merge "Fix some things in settings: manage apps, battery, procstats" into lmp-dev
* commit '1d463fb1e1488c1e37789537d4c3437d480cc864':
|
2014-09-19 06:19:25 +00:00 |
|
Svetoslav
|
499e711161
|
am c73b179d: am 0a91a8d2: am c33aef20: am c50841ca: am 85dcef12: Fix settings crash in print job screen.
* commit 'c73b179d59299a89846a9a7157dfdb2a13c1392d':
|
2014-09-19 06:19:23 +00:00 |
|
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 |
|