OSDN Git Service
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 06:19:15 +0000 (06:19 +0000)]
am
5b792c6b: am
23496243: am
b2259b3a: am
b46eeeb7: am
f572fdd1: Merge "Fixing Trusted Credentials Settings crash" into lmp-dev
* commit '
5b792c6b817f10151c380ae63ce7f3852096f159':
Fabrice Di Meglio [Fri, 19 Sep 2014 06:19:13 +0000 (06:19 +0000)]
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':
PauloftheWest [Fri, 19 Sep 2014 06:19:12 +0000 (06:19 +0000)]
am
a90713df: am
08455c57: am
c1806600: am
23d0ac44: am
b2197d90: Added bluetooth_device_settings_header to fix build breakage.
* commit '
a90713df317928c6ccae9b5e32853a277e5ccc01':
Jim Miller [Fri, 19 Sep 2014 06:19:11 +0000 (06:19 +0000)]
am
c31f5615: am
0787af48: am
825eb63c: am
f496ae94: am
ca03758e: Merge "Keep unlock attempt count after configuration change" into lmp-dev
* commit '
c31f5615815d7a7dce7e6045f8db7d1cb1adefd4':
Baligh Uddin [Fri, 19 Sep 2014 06:19:10 +0000 (06:19 +0000)]
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
PauloftheWest [Fri, 19 Sep 2014 06:19:08 +0000 (06:19 +0000)]
am
4e7ebb33: am
52e19465: am
1675c786: Merge "Made Bluetooth device dialog fully scrollable." into lmp-dev
* commit '
4e7ebb332654a24254e9f7d59c05e4de33ccfa3d':
John Spurlock [Fri, 19 Sep 2014 06:19:07 +0000 (06:19 +0000)]
am
f4ca7697: am
315e0a4a: am
31915522: Settings: Remove fixed dropdown width from "From" pref.
* commit '
f4ca7697d826ebb1ce640dfebace66706db6ac29':
PauloftheWest [Fri, 19 Sep 2014 06:19:05 +0000 (06:19 +0000)]
am
ab9fe9d3: am
4708092e: am
8b7d27cb: Merge "Updated Bluetooth keyboard icon to teal." into lmp-dev
* commit '
ab9fe9d3e63f749014fa68f1c9a93998032fe46c':
Jason Monk [Fri, 19 Sep 2014 06:19:04 +0000 (06:19 +0000)]
Fabrice Di Meglio [Fri, 19 Sep 2014 06:19:03 +0000 (06:19 +0000)]
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':
John Spurlock [Fri, 19 Sep 2014 06:19:02 +0000 (06:19 +0000)]
am
0c91e31d: am
417b8261: am
1e7dbd45: Settings: Use the same day sequence for downtime.
* commit '
0c91e31da8e2ba0431939dcd023e7444e41abbf8':
John Spurlock [Fri, 19 Sep 2014 06:19:01 +0000 (06:19 +0000)]
am
0ea17d3b: am
0ed4f5b7: am
cddb2954: Settings: Make downtime days scrollable.
* commit '
0ea17d3b0510b78a2d06446ec136afde2c25ba4b':
Matthew Xie [Fri, 19 Sep 2014 06:18:59 +0000 (06:18 +0000)]
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':
Carlos Valdivia [Fri, 19 Sep 2014 06:18:58 +0000 (06:18 +0000)]
am
418c900f: am
cece1cb2: am
af85b740: Merge "SECURITY: Prevent preference intents from exploiting settings." into lmp-dev
* commit '
418c900f9436b0812def6075e8ab7a102dd563ba':
Elliott Hughes [Fri, 19 Sep 2014 06:18:57 +0000 (06:18 +0000)]
am
0541c7ab: am
6312a721: am
a6e57b88: Merge "Always use the LocalePicker\'s preferred locale names." into lmp-dev
* commit '
0541c7ab1b1dbb561cd53e4e84b9ffbf14000acd':
Jorim Jaggi [Fri, 19 Sep 2014 06:18:56 +0000 (06:18 +0000)]
am
8e73e6c4: am
723abba6: am
b2bea36b: Merge "Fix layout issues with landscape pattern/password layouts" into lmp-dev
* commit '
8e73e6c4360c42c2bd59f3ed93b1af5b517476eb':
PauloftheWest [Fri, 19 Sep 2014 04:46:58 +0000 (04:46 +0000)]
am
771fd894: am
56b3f338: am
654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev
* commit '
771fd894b7ceff7b6c93157881fb7cacf138f478':
Amith Yamasani [Fri, 19 Sep 2014 04:46:58 +0000 (04:46 +0000)]
am
9c5104e6: am
b8931381: am
67079996: Merge "Handle disallowed NFC beam restriction" into lmp-dev
* commit '
9c5104e610e6bb408899c0763fabec48ef6bfd07':
Adam Lesinski [Fri, 19 Sep 2014 04:46:56 +0000 (04:46 +0000)]
am
53a09c27: am
98739309: am
3649045d: Merge "Make UsageAccess WarningDialog actually instatiatable." into lmp-dev
* commit '
53a09c27111f428aadaca57f4cf38525e02e79bf':
PauloftheWest [Fri, 19 Sep 2014 04:46:55 +0000 (04:46 +0000)]
am
c8733c8a: am
4cf6dcf6: am
29a9c684: Merge "Removed connect button from Saved Networks dialog." into lmp-dev
* commit '
c8733c8a187f37573973f6e65452084d28971dba':
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 04:46:54 +0000 (04:46 +0000)]
am
e692ec6a: am
dbcfc1b7: am
574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
* commit '
e692ec6a12e82fe11af7f7956089265a6090699c':
Elliott Hughes [Fri, 19 Sep 2014 04:46:53 +0000 (04:46 +0000)]
am
1625fd5a: am
bce031b0: am
5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit '
1625fd5ac92530ff99cd17542e9d2c9cc8bc7961':
PauloftheWest [Fri, 19 Sep 2014 04:46:52 +0000 (04:46 +0000)]
am
45a14bb2: am
5dcec205: am
bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '
45a14bb2399deab02e0bcd6b24b059f47b682569':
PauloftheWest [Fri, 19 Sep 2014 04:46:51 +0000 (04:46 +0000)]
am
ca5ea573: am
91f76560: am
e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit '
ca5ea573d7cccb46f7066d8e24e0df9429f1bbde':
PauloftheWest [Fri, 19 Sep 2014 04:46:50 +0000 (04:46 +0000)]
am
644a9f81: am
9128659b: am
d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '
644a9f8130afa9f9b047a1e6f2c8fba8426f0582':
Andres Morales [Fri, 19 Sep 2014 04:46:49 +0000 (04:46 +0000)]
am
096efb6b: am
a40a9a90: am
4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit '
096efb6b6714a1e743ace52d6987be1cdc8c57d5':
PauloftheWest [Fri, 19 Sep 2014 04:46:48 +0000 (04:46 +0000)]
am
7ea894ea: am
5c86c955: am
5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '
7ea894eadacac2064b902ca0c9ae2c811bd569c9':
Alan Viverette [Fri, 19 Sep 2014 04:46:47 +0000 (04:46 +0000)]
am
71135c4f: am
ce7c0337: am
01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit '
71135c4f100819d8faf4921614f4266f74dbd960':
vandwalle [Fri, 19 Sep 2014 04:46:46 +0000 (04:46 +0000)]
am
665bf2bf: am
4d5ddf0c: am
c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '
665bf2bf6aa8d1ccddf5090475f795db816a926a':
Alexandra Gherghina [Fri, 19 Sep 2014 04:46:45 +0000 (04:46 +0000)]
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':
Carlos Valdivia [Fri, 19 Sep 2014 04:46:44 +0000 (04:46 +0000)]
am
88c24fe1: am
b38b1b9e: am
690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
* commit '
88c24fe1fb48643bfc320b152d888cbc465c93ff':
Jim Miller [Fri, 19 Sep 2014 04:46:43 +0000 (04:46 +0000)]
am
12fb0406: am
75c782bf: am
1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
* commit '
12fb0406be5b0ca6c98b466a7af9b26e7c95e1c3':
Alexandra Gherghina [Fri, 19 Sep 2014 04:46:42 +0000 (04:46 +0000)]
am
14dfc45c: am
ba89f50a: am
80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev
* commit '
14dfc45cddea3ddd5fceda18f0d79c8ce5f3d3c2':
Alexandra Gherghina [Fri, 19 Sep 2014 04:46:41 +0000 (04:46 +0000)]
am
b897f8c5: am
70ad4ffd: am
dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
* commit '
b897f8c534fc685eb5ed6fa0ca96c5d08d29b42f':
Amith Yamasani [Fri, 19 Sep 2014 04:46:39 +0000 (04:46 +0000)]
Fabrice Di Meglio [Fri, 19 Sep 2014 04:46:38 +0000 (04:46 +0000)]
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':
PauloftheWest [Fri, 19 Sep 2014 04:46:35 +0000 (04:46 +0000)]
am
76ddec31: am
5437b488: am
c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
* commit '
76ddec3185d21a3fa4d4fceba7eace2122f2a04e':
Barnaby James [Fri, 19 Sep 2014 04:46:34 +0000 (04:46 +0000)]
am
a33056be: am
1299446d: am
3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
* commit '
a33056be9bc1456905a425942506f34b9f87708b':
Amith Yamasani [Fri, 19 Sep 2014 04:46:33 +0000 (04:46 +0000)]
am
21980026: am
ba790ca3: am
91648629: Merge "Follow API change for method name" into lmp-dev
* commit '
21980026de439e989564379b4eea8e2b882cf787':
Svetoslav [Fri, 19 Sep 2014 04:46:32 +0000 (04:46 +0000)]
am
02afa3d9: am
9b8912db: am
fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
* commit '
02afa3d95d798618e86dc812c136df5eb372ab23':
Svetoslav [Fri, 19 Sep 2014 04:46:31 +0000 (04:46 +0000)]
am
3e11eddf: am
3c0385e4: am
527ecccc: Merge "Update Settings due to API changes." into lmp-dev
* commit '
3e11eddfe2b6ad2d4848655bab30d9503aeee40b':
Jorim Jaggi [Fri, 19 Sep 2014 04:46:30 +0000 (04:46 +0000)]
am
d832fa15: am
60b7e882: am
f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
* commit '
d832fa1589b9cfca4e4f349a76dd9eec916ed8a6':
Alexandra Gherghina [Fri, 19 Sep 2014 04:46:28 +0000 (04:46 +0000)]
Alexandra Gherghina [Fri, 19 Sep 2014 04:46:27 +0000 (04:46 +0000)]
am
f1f0b256: am
8378516b: am
9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
* commit '
f1f0b2567b57721164799d9dcf235e1b45363999':
Dan Sandler [Fri, 19 Sep 2014 04:46:26 +0000 (04:46 +0000)]
am
d1234c88: am
6f0507ad: am
8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.
* commit '
d1234c882ff0415d00c45a5fc57a202392da6c20':
Wink Saville [Fri, 19 Sep 2014 04:46:24 +0000 (04:46 +0000)]
am
91a69d35: am
0e559d53: am
aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
* commit '
91a69d353f6458caf0e9dc13af69b55e62d2655a':
Fabrice Di Meglio [Fri, 19 Sep 2014 04:46:23 +0000 (04:46 +0000)]
am
3ef7e17b: am
a1c6288b: am
0535ed55: Merge "Fix bug #
17393417 Developer Options are not indexed after activating them" into lmp-dev
* commit '
3ef7e17becd8b5335e1357d517b5d67cd96d982f':
PauloftheWest [Fri, 19 Sep 2014 04:46:21 +0000 (04:46 +0000)]
am
dd476d16: am
4cebc121: am
4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
* commit '
dd476d1629d8282289c55230083658c354a4c043':
Chris Wren [Fri, 19 Sep 2014 04:46:20 +0000 (04:46 +0000)]
am
f686a1fd: am
2ed0ea21: am
0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '
f686a1fd269ac67728723be2475acb4e65daf7ba':
Fabrice Di Meglio [Fri, 19 Sep 2014 04:46:19 +0000 (04:46 +0000)]
am
5ae5557e: am
f475cfa3: am
ed1175cf: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
* commit '
5ae5557e51b2bf98e6f9264d2418a0d6fa3cb221':
Andres Morales [Fri, 19 Sep 2014 04:46:18 +0000 (04:46 +0000)]
am
02655776: am
db9745e4: am
5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev
* commit '
02655776a0419125a64c47a76262169942ee1278':
Andres Morales [Fri, 19 Sep 2014 04:46:17 +0000 (04:46 +0000)]
am
31124453: am
d5723235: am
1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
* commit '
311244539a43cf67c771259b9ca1c1e6cc6edd3a':
Baligh Uddin [Fri, 19 Sep 2014 04:46:16 +0000 (04:46 +0000)]
am
2a106e2e: (-s ours) am
19843ad1: (-s ours) am
87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
2a106e2e93404bf23f9222e3c1fc981dd60524ed':
Baligh Uddin [Fri, 19 Sep 2014 04:46:15 +0000 (04:46 +0000)]
am
3b2d2570: (-s ours) am
184a7b4f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
3b2d25707a2a724de79dc7bddf61ea80db3f1b53':
Import translations. DO NOT MERGE
PauloftheWest [Fri, 19 Sep 2014 04:46:14 +0000 (04:46 +0000)]
am
0bc56b9c: am
357e2826: am
0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
* commit '
0bc56b9c03d1580bbeea6c489c827f68791d0812':
PauloftheWest [Fri, 19 Sep 2014 04:46:13 +0000 (04:46 +0000)]
am
fe0bf29c: am
0410a1e3: am
92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
* commit '
fe0bf29ce50c7298a545274f54d84cb160f282f6':
Fabrice Di Meglio [Fri, 19 Sep 2014 04:46:12 +0000 (04:46 +0000)]
am
32434f0b: am
e758df57: am
5a8a75d9: Merge "Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
* commit '
32434f0b638dea85f71a9d79aa22f92a1dfd747e':
Chris Wren [Fri, 19 Sep 2014 04:46:11 +0000 (04:46 +0000)]
am
d351676e: am
dd95e098: am
ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit '
d351676e311d57055cf74ee85245a0faa552bbb1':
Chris Wren [Fri, 19 Sep 2014 04:46:10 +0000 (04:46 +0000)]
am
19f50c2e: am
cec40645: am
77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '
19f50c2e5676f25837f331ade2f5b640242eb2c4':
Dan Sandler [Fri, 19 Sep 2014 04:46:09 +0000 (04:46 +0000)]
am
5d29c660: am
84176e56: am
feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev
* commit '
5d29c6603ecca1df40a7001ac73f0a37cbf440aa':
PauloftheWest [Fri, 19 Sep 2014 04:46:08 +0000 (04:46 +0000)]
am
fed937f0: am
75b8535f: am
e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
* commit '
fed937f07abc0474eadf9fbc6e65f7080448fd4e':
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 04:46:07 +0000 (04:46 +0000)]
am
d35829bc: am
34e537ed: am
c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
* commit '
d35829bcb3342f58796ae9b20cc0c89bd6098615':
Zoltan Szatmary-Ban [Fri, 19 Sep 2014 04:46:06 +0000 (04:46 +0000)]
am
be146343: am
4c035b8f: am
1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
* commit '
be146343e47d162d20c6095b83915bebef72eb69':
Alexandra Gherghina [Fri, 19 Sep 2014 04:46:05 +0000 (04:46 +0000)]
am
131d34ae: am
c24310c9: am
9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
* commit '
131d34aecdd3af3680ab54aebd6d46d6c6f8eedb':
PauloftheWest [Fri, 19 Sep 2014 04:46:04 +0000 (04:46 +0000)]
am
44581c7f: am
b448ea3a: am
7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
* commit '
44581c7ffdbce9fc863134edbb9b652e663e7e84':
Fabrice Di Meglio [Fri, 19 Sep 2014 04:46:03 +0000 (04:46 +0000)]
am
1695f40e: am
842feb89: am
52a48226: Merge "Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
* commit '
1695f40e527ecd66486016755a7d175e35521a0f':
Fabrice Di Meglio [Fri, 19 Sep 2014 04:46:02 +0000 (04:46 +0000)]
am
c1c10754: am
9786d300: am
815dc273: Merge "Fix bug #
17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev
* commit '
c1c10754a649d1c28a42b5186c0e89a9a71de0f3':
Wink Saville [Fri, 19 Sep 2014 04:46:00 +0000 (04:46 +0000)]
am
c2c89bf8: am
a535fcb5: am
418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev
* commit '
c2c89bf82f89b3913e61d922317f294a515d359c':
Fabrice Di Meglio [Fri, 19 Sep 2014 04:45:58 +0000 (04:45 +0000)]
am
f6713c2a: am
bcd1ff97: am
b5caa647: Merge "Fix bug #
17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
* commit '
f6713c2a17b1eb75e8545746daf676a0fc624a95':
Dan Sandler [Fri, 19 Sep 2014 04:45:56 +0000 (04:45 +0000)]
am
bb533452: am
2f64d506: am
b58b5127: Fix links to notification settings activities.
* commit '
bb533452beb55b89bc247a0ea0e3ade265b65a0c':
Vinit Deshpande [Fri, 19 Sep 2014 04:45:54 +0000 (04:45 +0000)]
am
b89d1109: am
05725beb: am
963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
* commit '
b89d11098020108835873dabed9d5ce4472d09f2':
Amith Yamasani [Fri, 19 Sep 2014 04:45:51 +0000 (04:45 +0000)]
am
25661d68: am
12997ecd: am
99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev
* commit '
25661d68fd333bc52a2b81bda3b9c338bbf93686':
PauloftheWest [Fri, 19 Sep 2014 04:45:49 +0000 (04:45 +0000)]
am
4a20069d: am
43454701: am
ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
* commit '
4a20069dc0acf2aec19e546c2521c594bf8a3fc0':
Jason Monk [Fri, 19 Sep 2014 04:45:47 +0000 (04:45 +0000)]
am
710b8857: am
c8d9504e: am
dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
* commit '
710b8857a865371ddc24b18560b1045fb076cb73':
Paul Lawrence [Fri, 19 Sep 2014 04:45:45 +0000 (04:45 +0000)]
am
f88a60f0: am
8826a64a: am
1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit '
f88a60f09e1eaa989408c6b09f0b24ed876b9fb3':
Maurice Lam [Fri, 19 Sep 2014 04:45:43 +0000 (04:45 +0000)]
am
2b193bc9: am
8efe9278: am
def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev
* commit '
2b193bc952460afe5dcc6d837abd77a850147529':
PauloftheWest [Fri, 19 Sep 2014 04:45:42 +0000 (04:45 +0000)]
am
dbfc2fe1: am
9fef5db8: am
bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
* commit '
dbfc2fe1b3205a005520dc4cc331d75ea41ead8b':
Fabrice Di Meglio [Fri, 19 Sep 2014 04:45:41 +0000 (04:45 +0000)]
am
72c7d705: am
8bde623e: am
de8c683f: Merge "Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
* commit '
72c7d7052cfe2981c7a2531d8d7d0e42f33d7e81':
Dan Sandler [Fri, 19 Sep 2014 04:45:40 +0000 (04:45 +0000)]
am
2a124922: am
c8c5091f: am
3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
* commit '
2a1249225f072915d3fd3b4464fe91ff727e2031':
PauloftheWest [Fri, 19 Sep 2014 04:45:39 +0000 (04:45 +0000)]
am
84acfc61: am
a8d4b005: am
d6cfeba9: Merge "Updated Wifi Assistant to support RTL." into lmp-dev
* commit '
84acfc617e669ffff87d183164298cef9ee421eb':
Baligh Uddin [Fri, 19 Sep 2014 04:45:37 +0000 (04:45 +0000)]
am
7ddba441: (-s ours) am
25728d22: (-s ours) am
48d3f0fd: (-s ours) Import translations. DO NOT MERGE
* commit '
7ddba4418b89e3e66d97c842462fe39b396ed791':
Baligh Uddin [Fri, 19 Sep 2014 04:45:36 +0000 (04:45 +0000)]
am
487e9235: (-s ours) am
d7697f0f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
487e923551735452c76e32c29018b4862314772d':
Import translations. DO NOT MERGE
Wink Saville [Fri, 19 Sep 2014 04:45:35 +0000 (04:45 +0000)]
am
ea569f48: am
98365869: ksd to lmp-sprout-dev
* commit '
ea569f481756ece8f3945de8f1d4630842e2cde8':
ksd to lmp-sprout-dev
PauloftheWest [Thu, 18 Sep 2014 16:24:56 +0000 (16:24 +0000)]
am
58da4c37: am
c932957d: am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
58da4c37276ba1102a4a524b2a56c0b5db0e477f':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 16:12:14 +0000 (16:12 +0000)]
am
c932957d: am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
c932957d4e56c756acea56c11347b4da35a30983':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 16:00:59 +0000 (16:00 +0000)]
am
0f01eeff: Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '
0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
Removed an extraneous messge when pairing.
PauloftheWest [Thu, 18 Sep 2014 15:51:49 +0000 (15:51 +0000)]
Merge "Removed an extraneous messge when pairing." into lmp-dev
Sander Alewijnse [Thu, 18 Sep 2014 12:07:39 +0000 (12:07 +0000)]
am
0fe16796: am
c995e733: am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:56:32 +0000 (11:56 +0000)]
am
c995e733: am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
c995e73391bb4f46154d506f198ee4dec85bae4c':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:46:11 +0000 (11:46 +0000)]
am
4241b0a9: Merge "Update targetSdkVersion check." into lmp-dev
* commit '
4241b0a9627e424adb897ec894a34ddce8fd77e3':
Update targetSdkVersion check.
Sander Alewijnse [Thu, 18 Sep 2014 11:36:30 +0000 (11:36 +0000)]
Merge "Update targetSdkVersion check." into lmp-dev
Mark Salyzyn [Wed, 17 Sep 2014 23:46:59 +0000 (23:46 +0000)]
am
22955813: am
5f288bc1: am
894af268: logd: settings: ro.config.low_ram support
* commit '
229558137318fdebce6b1bf3f5b30ea96e65a400':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 23:32:07 +0000 (23:32 +0000)]
am
5f288bc1: am
894af268: logd: settings: ro.config.low_ram support
* commit '
5f288bc17c79c76090075db3a8a307c6421b9eb0':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 23:25:57 +0000 (23:25 +0000)]
am
894af268: logd: settings: ro.config.low_ram support
* commit '
894af268def8a817306ea83f21cb25b6f0edf2e3':
logd: settings: ro.config.low_ram support
Mark Salyzyn [Wed, 17 Sep 2014 21:05:15 +0000 (14:05 -0700)]
logd: settings: ro.config.low_ram support
- limit settings to 64K, 256K and 1M if ro.config.low_ram true
- Correctly handle ro.logd.size
Bug:
17526187
Change-Id: I2380b649516b29c2a98f54de18e5a4780b3421ce
PauloftheWest [Tue, 16 Sep 2014 19:29:17 +0000 (12:29 -0700)]
Removed an extraneous messge when pairing.
+ When two devices are executing Bluetooth simply pairing, which does
not need keyboard input, the message "Type the pairing code then press
Return or Enter." has been removed.
+ Note that in legacy pairing the message to type in the pairing key
should remain even if the user is only verifying the key. The reason is
that we are not able to guarantee the other device does not have to input
the key.
+ Also updated pin entry to Material/Quantum specification.
Bug:
17400402
Change-Id: I7853fa13835f7f60d0e71102de9a079708f3544e
Amith Yamasani [Wed, 17 Sep 2014 20:38:49 +0000 (20:38 +0000)]
am
2f8b4173: am
ae2da7a9: am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
2f8b4173581bb7a7421f6c49dee236cdebc66aaf':
Don't allow creating a guest from a secondary user...
Amith Yamasani [Wed, 17 Sep 2014 20:28:06 +0000 (20:28 +0000)]
am
ae2da7a9: am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
ae2da7a90bd9dad3522611f1f105788e1d11fe81':
Don't allow creating a guest from a secondary user...
Amith Yamasani [Wed, 17 Sep 2014 20:16:43 +0000 (20:16 +0000)]
am
69b67465: Merge "Don\'t allow creating a guest from a secondary user..." into lmp-dev
* commit '
69b674656af869219189fe0f7985c011d29d9b7e':
Don't allow creating a guest from a secondary user...
Amith Yamasani [Wed, 17 Sep 2014 20:06:59 +0000 (20:06 +0000)]
Merge "Don't allow creating a guest from a secondary user..." into lmp-dev