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 |
|
PauloftheWest
|
fe6a4be3ca
|
am 0c32b376: am 58da4c37: am c932957d: am 0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '0c32b376b81328de2c60c2cfcc6cd7e81dfdb4e0':
|
2014-10-27 20:38:09 +00:00 |
|
Sander Alewijnse
|
80264faed4
|
am ef888ead: am 0fe16796: am c995e733: am 4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit 'ef888ead0d90231649f799f3424b1e3a14aee62f':
|
2014-10-27 20:38:08 +00:00 |
|
Mark Salyzyn
|
f58fae7cfe
|
am 54d56e6b: am 22955813: am 5f288bc1: am 894af268: logd: settings: ro.config.low_ram support
* commit '54d56e6bb325c07abf63eef9607b342bd9a58ddf':
|
2014-10-27 20:38:07 +00:00 |
|
Amith Yamasani
|
f5f7842b07
|
am 84af5ffd: am 2f8b4173: am ae2da7a9: am 69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '84af5ffd89ffdd9a695adb2dfdc3c7d4954c97b8':
|
2014-10-27 20:38:06 +00:00 |
|
John Spurlock
|
5ecad9cbdb
|
am 96cd9251: am ab4fe2d9: am 9e51261d: am ae9d437b: Merge "Settings: Ensure CryptKeeper dismisses secure keyguards." into lmp-dev
* commit '96cd925174f6c678b4242ccd4d8b5ccee94a81fc':
|
2014-10-27 20:38:05 +00:00 |
|
PauloftheWest
|
cd9bf25db6
|
am 4a62d8e6: am 63f9500e: am 08183704: am 3cc81aea: Increase char limit for translation.
* commit '4a62d8e69f095b301ff323fba7bd87111cfb6c73':
|
2014-10-27 20:38:03 +00:00 |
|
Maurice Lam
|
6f2f7812fa
|
am 69ea67b6: am 2ffb10d2: am fd4e0f25: am 27d74fa2: Merge "[WifiSetup] Update connection state for auto-finish" into lmp-dev
* commit '69ea67b60ada436ace48ddf89539fb852d98e3ec':
|
2014-10-27 20:38:02 +00:00 |
|
Baligh Uddin
|
3ca01626ca
|
am 70aabfde: (-s ours) am fbb0218a: (-s ours) am 1741abb9: (-s ours) am 09a11d5b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '70aabfde6136de5684d6818728c5e41128f9a895':
|
2014-10-27 20:38:01 +00:00 |
|
PauloftheWest
|
2b88d51ccf
|
am a186ce83: am d1cd913a: am 9007cf63: am ec21e62a: Merge "Alignment updates for Wi-Fi Settings dialog." into lmp-dev
* commit 'a186ce831f3f346a302ca1d3e69b4cbad9687610':
|
2014-10-27 20:38:00 +00:00 |
|
Edward Jee
|
863d8fc013
|
am 6fc08883: am 000dd0a6: am a99ef887: am ac8b5b7f: Migrates PBAP and MAP access permission data from Settings to Bluetooth.
* commit '6fc08883cebe328fd92f289502cfb73fe3c29f5a':
|
2014-10-27 20:37:59 +00:00 |
|
Edward Jee
|
22bc49035c
|
am cea371ca: am 32c56ed4: am 50b6eec9: am b0954c1d: Merge "Do not show phonebook access permission dialog if pairing dialog has already been shown." into lmp-dev
* commit 'cea371caf2db6d0d5180e0dcf4100cf631aa3444':
|
2014-10-27 20:37:58 +00:00 |
|
PauloftheWest
|
115916a579
|
am 20cb5d91: am 8dee66d1: am 720af580: am 0ca0c8ad: Merge "Removed all references to "Google Wi-Fi Assistant" from Settings." into lmp-dev
* commit '20cb5d910138877b312c13f22385792402ac2c4a':
|
2014-10-27 20:37:57 +00:00 |
|
Dianne Hackborn
|
d7760f77ef
|
am b453421f: am 2acec676: am bf4ecab3: am 94aae9af: Little more on issue #17495264: tweak when we ignore initial times.
* commit 'b453421f92c0b43518cf15c9785c5dd4877225fc':
|
2014-10-27 20:37:56 +00:00 |
|
Dianne Hackborn
|
f0f7f1802a
|
am 6a300d00: am ff966f2a: am 829b9975: am ecffbc91: Merge "Fix issue #17495264: Battery history graph is bad" into lmp-dev
* commit '6a300d00aab43f123ace45e2fc70a573ab53d635':
|
2014-10-27 20:37:54 +00:00 |
|
Maurice Lam
|
c3189476dd
|
am 6476e981: am ea8db10a: am 0d09c6c1: am 795511ec: [WifiSetup] Disable app starting window
* commit '6476e98139459e49be4547d2cbcdf8087ef8d219':
|
2014-10-27 20:37:53 +00:00 |
|
PauloftheWest
|
2d7e3814c4
|
am c956628c: am f1fc7219: am 24233660: am 13fbd848: Merge "Updated Wi-Fi Settings icons to new filled-in teal format." into lmp-dev
* commit 'c956628c74b29078fb4a80352ac4080278e830c3':
|
2014-10-27 20:37:52 +00:00 |
|
Geoff Mendal
|
52732b3f40
|
am 56e62487: (-s ours) Import translations. DO NOT MERGE automerge: f571e51 -s ours
* commit '56e6248737ba2d090fc4826c5eb265a29776670d':
Import translations. DO NOT MERGE
|
2014-10-27 20:37:51 +00:00 |
|
Wink Saville
|
cb02b97f8d
|
am 4aab7ecb: Merge "Change subId to int from long" into lmp-mr1-dev
* commit '4aab7ecb56e9af4600b126c67d7efe0b7e1f6ee1':
Change subId to int from long
|
2014-10-27 20:37:06 +00:00 |
|
Geoff Mendal
|
967c000603
|
am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c -s ours
* commit '855f0d264343325fb308bd27c509d7f95893d645':
Import translations. DO NOT MERGE
|
2014-10-27 20:37:05 +00:00 |
|
Geoff Mendal
|
9ab85cf0e0
|
am 40f84ca0: (-s ours) Import translations. DO NOT MERGE
* commit '40f84ca02033ce62e301dd6d16fdc1f4b9a5326a':
Import translations. DO NOT MERGE
|
2014-10-27 20:37:04 +00:00 |
|
Geoff Mendal
|
1dc92b3733
|
am bf9175c0: (-s ours) am 795c8378: (-s ours) Import translations. DO NOT MERGE
* commit 'bf9175c03bb47cf85af809a21cd45cbc989ade63':
|
2014-10-27 18:53:20 +00:00 |
|
Baligh Uddin
|
6e05caac2c
|
am 5b3f6a3a: (-s ours) am 25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '5b3f6a3a6d6f580784f4745d635b2abbe5d47618':
|
2014-10-27 18:53:19 +00:00 |
|
Jim Miller
|
d4072bce62
|
am cd8971a9: am aa037675: Fix bad string in EncryptionInterstitial
* commit 'cd8971a9e95ec918322e670af93e042c5587ea07':
|
2014-10-27 18:53:18 +00:00 |
|
Jim Miller
|
d57be02ad5
|
am 7b13fe8f: am 47adff0a: Show warning dialog when Accessibility is enabled
* commit '7b13fe8f907910868c46921e25f481909c80964f':
|
2014-10-27 18:53:17 +00:00 |
|
Jim Miller
|
df99f650bd
|
am b72f97c0: am 602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit 'b72f97c0f18c08972997ddce481b8939566a135c':
|
2014-10-27 18:53:16 +00:00 |
|
Svetoslav
|
58d6b51131
|
am fec94660: am ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit 'fec94660fb1b3ea76b49c52e1a6d0741e19bec2a':
|
2014-10-27 18:53:15 +00:00 |
|
Amith Yamasani
|
64aedae130
|
am 2ae9f8ab: am e52c159c: Fix some strings for the encryption stuff.
* commit '2ae9f8aba61ce28bb3cdb38c915f2a1ccc33b811':
|
2014-10-27 18:53:14 +00:00 |
|
Jim Miller
|
7c6185041e
|
am 9a7f7a34: am 4f903c3e: Add strings for upcoming change.
* commit '9a7f7a34aea8ef49564c160cbc8d9bed43407c9c':
|
2014-10-27 18:53:13 +00:00 |
|
Svetoslav
|
b176636853
|
am c8a1bb5a: am 3ea423ae: User to confirm credentials if an accessibility service changes encryption.
* commit 'c8a1bb5a4d069ac08196287e4853cb18fd723086':
|
2014-10-27 18:53:12 +00:00 |
|
Geoff Mendal
|
4402b04767
|
am d33f7d6a: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'd33f7d6a6201edb0f15f25511c9c3323b67a295a':
|
2014-10-27 18:53:11 +00:00 |
|
Jim Miller
|
c65633eb27
|
am 9afd56e0: am 46c7f6d6: Add a checkbox option to \'require password to decrypt\'
* commit '9afd56e08d872c6786cd622488c926e6b7a5524a':
|
2014-10-27 18:53:10 +00:00 |
|
Fabrice Di Meglio
|
c4ea2969f6
|
am 84ff9901: am 94dce761: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
* commit '84ff9901341c1bad328f6e4d552e308f22d4d3c2':
|
2014-10-27 18:53:09 +00:00 |
|
Jason Monk
|
ea9819f4ad
|
am 8b1fe3b8: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
* commit '8b1fe3b8e0193748d319d5b0b4a375586bab1379':
|
2014-10-27 18:53:08 +00:00 |
|
Andres Morales
|
db4c54b68f
|
am 4a9b3cf5: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit '4a9b3cf50605d8e074e51166c49dbebcdcad1f75':
|
2014-10-27 18:53:07 +00:00 |
|