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 |
|
vandwalle
|
9ef7735987
|
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 '60790f7b2a07c9ae79df6d8f1d02974e676791b7':
|
2014-10-27 18:53:06 +00:00 |
|
Geoff Mendal
|
595c3349d8
|
am a9cd186c: (-s ours) am e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'a9cd186c9491ec56b9c3ea0fe9f7dbad00b8fad1':
|
2014-10-27 18:53:05 +00:00 |
|
John Spurlock
|
590f44a2df
|
am b3ce7874: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit 'b3ce7874ff4c887f37532fbff31e4c2659ca9d4c':
|
2014-10-27 18:53:04 +00:00 |
|
Alan Viverette
|
061c8b0011
|
am 673e3c28: am 178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '673e3c28f4c9860f452d421028cc60af08208437':
|
2014-10-27 18:53:03 +00:00 |
|
Amit Mahajan
|
b1d81165ce
|
am 6f451050: am 88b2790d: Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
* commit '6f451050a77b8535ed00d06beddaa2eeb2488f2c':
|
2014-10-27 18:53:02 +00:00 |
|
Dianne Hackborn
|
88f7a6a7c1
|
am df8683d2: am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit 'df8683d237f3a4b2e82e051d7c794ec3a744a736':
|
2014-10-27 18:53:01 +00:00 |
|
Zoltan Szatmary-Ban
|
21b3566dfb
|
am 4ce8802e: am 50263efb: Remove CA Cert UI item from one list only
* commit '4ce8802e410c8f18d37f20188adab30395ceb440':
|
2014-10-27 18:52:59 +00:00 |
|
Amith Yamasani
|
69f5e5ed63
|
am 195b1583: am 742a6803: Merge "Set default restrictions for a newly created user" into lmp-dev
* commit '195b15833cb2db872980272d5c75ea33ab8c791d':
|
2014-10-27 18:52:58 +00:00 |
|
Geoff Mendal
|
5af09c9d8e
|
am 185e1722: (-s ours) am 7096c2dd: (-s ours) Import translations. DO NOT MERGE
* commit '185e17221a54f8c201d27d291a30f01f1f7641dd':
|
2014-10-27 18:52:57 +00:00 |
|
Baligh Uddin
|
adcf72abda
|
am bbf9927b: (-s ours) am 43848de1: (-s ours) Import translations. DO NOT MERGE
* commit 'bbf9927b1bdc3767c73efee1daf0019374ede021':
|
2014-10-27 18:52:56 +00:00 |
|
Svetoslav
|
f7b5f424d5
|
am b792f69e: am 5cdd3f4f: Update accessibility plus secure lock warning messages.
* commit 'b792f69eb416a0c6ac15d81413eef6c6e97fb1eb':
|
2014-10-27 18:52:55 +00:00 |
|
John Spurlock
|
b96de5b088
|
am 041ebc1b: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev
* commit '041ebc1bfc669da45eb3a36db1c221b3ce39abb4':
|
2014-10-27 18:52:54 +00:00 |
|
PauloftheWest
|
94841dc1e5
|
am d005440f: am 6e26427e: Updated Wi-Fi hotspot dialog to the Material Spec.
* commit 'd005440fa9162f4e7c6e4664ae1db74fb624ec98':
|
2014-10-27 18:52:53 +00:00 |
|
PauloftheWest
|
86ac419cad
|
am 324f29c8: am 59d33dbd: Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev
* commit '324f29c86db2e746ec5fc41ddd0b81444e6bf76c':
|
2014-10-27 18:52:51 +00:00 |
|
Alan Viverette
|
ffac1ac92f
|
am dc174c85: am 7a4d229d: Merge "Ensure recycled APN preferences are updated to show radio button" into lmp-dev
* commit 'dc174c8593063aa11a8a3777e6b70a646f0c0ef3':
|
2014-10-27 18:52:50 +00:00 |
|
Baligh Uddin
|
0627d066ca
|
am ee3d7127: (-s ours) am 9d4dc326: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'ee3d7127cf0e2c6952a75947989378f29db170aa':
|
2014-10-27 18:52:49 +00:00 |
|