Jorim Jaggi
|
a0de6956ee
|
am d832fa15 : am 60b7e882 : am f7cdbc3a : Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
* commit 'd832fa1589b9cfca4e4f349a76dd9eec916ed8a6':
|
2014-09-19 04:46:30 +00:00 |
|
Alexandra Gherghina
|
c2cf632f47
|
am aab02b86 : am da1e8c75 : am 51712241 : Fix typo in intent filter
* commit 'aab02b8673aee807acb3e1db6e71a3332ca1fb1d':
|
2014-09-19 04:46:28 +00:00 |
|
Alexandra Gherghina
|
25c4d4bfb4
|
am f1f0b256 : am 8378516b : am 9b6ab158 : Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
* commit 'f1f0b2567b57721164799d9dcf235e1b45363999':
|
2014-09-19 04:46:27 +00:00 |
|
Dan Sandler
|
575669b9b0
|
am d1234c88 : am 6f0507ad : am 8aed3e3f : Only fetch titles of ringtones coming from the MediaStore.
* commit 'd1234c882ff0415d00c45a5fc57a202392da6c20':
|
2014-09-19 04:46:26 +00:00 |
|
Wink Saville
|
b189ffd799
|
am 91a69d35 : am 0e559d53 : am aa188b53 : Merge "More cleanup prior to unhiding" into lmp-dev
* commit '91a69d353f6458caf0e9dc13af69b55e62d2655a':
|
2014-09-19 04:46:24 +00:00 |
|
Fabrice Di Meglio
|
99c1a2cc03
|
am 3ef7e17b : am a1c6288b : am 0535ed55 : Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev
* commit '3ef7e17becd8b5335e1357d517b5d67cd96d982f':
|
2014-09-19 04:46:23 +00:00 |
|
PauloftheWest
|
ce53ec332c
|
am dd476d16 : am 4cebc121 : am 4a1b7b5f : Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
* commit 'dd476d1629d8282289c55230083658c354a4c043':
|
2014-09-19 04:46:21 +00:00 |
|
Chris Wren
|
84d2e526ff
|
am f686a1fd : am 2ed0ea21 : am 0a59607e : Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit 'f686a1fd269ac67728723be2475acb4e65daf7ba':
|
2014-09-19 04:46:20 +00:00 |
|
Fabrice Di Meglio
|
268dc96507
|
am 5ae5557e : am f475cfa3 : am ed1175cf : Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
* commit '5ae5557e51b2bf98e6f9264d2418a0d6fa3cb221':
|
2014-09-19 04:46:19 +00:00 |
|
Andres Morales
|
1a92164c21
|
am 02655776 : am db9745e4 : am 5c9a3b0d : Merge "New black drawables for tap and pay" into lmp-dev
* commit '02655776a0419125a64c47a76262169942ee1278':
|
2014-09-19 04:46:18 +00:00 |
|
Andres Morales
|
2bdea1e79f
|
am 31124453 : am d5723235 : am 1c09186d : Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
* commit '311244539a43cf67c771259b9ca1c1e6cc6edd3a':
|
2014-09-19 04:46:17 +00:00 |
|
Baligh Uddin
|
e4eddf470a
|
am 2a106e2e : (-s ours) am 19843ad1 : (-s ours) am 87c7cec8 : (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '2a106e2e93404bf23f9222e3c1fc981dd60524ed':
|
2014-09-19 04:46:16 +00:00 |
|
Baligh Uddin
|
5679f5e619
|
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
|
2014-09-19 04:46:15 +00:00 |
|
PauloftheWest
|
bb4f8dd8a2
|
am 0bc56b9c : am 357e2826 : am 0e73c521 : Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
* commit '0bc56b9c03d1580bbeea6c489c827f68791d0812':
|
2014-09-19 04:46:14 +00:00 |
|
PauloftheWest
|
8d6b5a4bee
|
am fe0bf29c : am 0410a1e3 : am 92de681e : Merge "Fix the truncating of Bluetooth icons." into lmp-dev
* commit 'fe0bf29ce50c7298a545274f54d84cb160f282f6':
|
2014-09-19 04:46:13 +00:00 |
|
Fabrice Di Meglio
|
0c4c708302
|
am 32434f0b : am e758df57 : am 5a8a75d9 : Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
* commit '32434f0b638dea85f71a9d79aa22f92a1dfd747e':
|
2014-09-19 04:46:12 +00:00 |
|
Chris Wren
|
f3eb27ddcc
|
am d351676e : am dd95e098 : am ee846f88 : missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit 'd351676e311d57055cf74ee85245a0faa552bbb1':
|
2014-09-19 04:46:11 +00:00 |
|
Chris Wren
|
3a25069246
|
am 19f50c2e : am cec40645 : am 77fdc93b : Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '19f50c2e5676f25837f331ade2f5b640242eb2c4':
|
2014-09-19 04:46:10 +00:00 |
|
Dan Sandler
|
1339b03f08
|
am 5d29c660 : am 84176e56 : am feec34ce : Merge "Don\'t block notifications from system packages." into lmp-dev
* commit '5d29c6603ecca1df40a7001ac73f0a37cbf440aa':
|
2014-09-19 04:46:09 +00:00 |
|
PauloftheWest
|
5b5846b29a
|
am fed937f0 : am 75b8535f : am e1a164bf : Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
* commit 'fed937f07abc0474eadf9fbc6e65f7080448fd4e':
|
2014-09-19 04:46:08 +00:00 |
|
Zoltan Szatmary-Ban
|
6a31b7df82
|
am d35829bc : am 34e537ed : am c91d2cd0 : Merge "Put VPN settings under primary profile control" into lmp-dev
* commit 'd35829bcb3342f58796ae9b20cc0c89bd6098615':
|
2014-09-19 04:46:07 +00:00 |
|
Zoltan Szatmary-Ban
|
d4f400a016
|
am be146343 : am 4c035b8f : am 1e0ea452 : Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
* commit 'be146343e47d162d20c6095b83915bebef72eb69':
|
2014-09-19 04:46:06 +00:00 |
|
Alexandra Gherghina
|
be63f07cd1
|
am 131d34ae : am c24310c9 : am 9dce0791 : Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
* commit '131d34aecdd3af3680ab54aebd6d46d6c6f8eedb':
|
2014-09-19 04:46:05 +00:00 |
|
PauloftheWest
|
27f7e29680
|
am 44581c7f : am b448ea3a : am 7641e1ad : Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
* commit '44581c7ffdbce9fc863134edbb9b652e663e7e84':
|
2014-09-19 04:46:04 +00:00 |
|
Fabrice Di Meglio
|
ca0c4c5a26
|
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':
|
2014-09-19 04:46:03 +00:00 |
|
Fabrice Di Meglio
|
2c413b1840
|
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':
|
2014-09-19 04:46:02 +00:00 |
|
Wink Saville
|
d9e90ebb12
|
am c2c89bf8 : am a535fcb5 : am 418346d5 : Merge "Prepare to make SubscriptionManager public." into lmp-dev
* commit 'c2c89bf82f89b3913e61d922317f294a515d359c':
|
2014-09-19 04:46:00 +00:00 |
|
Fabrice Di Meglio
|
480bd6869c
|
am f6713c2a : am bcd1ff97 : am b5caa647 : Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
* commit 'f6713c2a17b1eb75e8545746daf676a0fc624a95':
|
2014-09-19 04:45:58 +00:00 |
|
Dan Sandler
|
d008dbe4cf
|
am bb533452 : am 2f64d506 : am b58b5127 : Fix links to notification settings activities.
* commit 'bb533452beb55b89bc247a0ea0e3ade265b65a0c':
|
2014-09-19 04:45:56 +00:00 |
|
Vinit Deshpande
|
c1579332f4
|
am b89d1109 : am 05725beb : am 963ce475 : Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
* commit 'b89d11098020108835873dabed9d5ce4472d09f2':
|
2014-09-19 04:45:54 +00:00 |
|
Amith Yamasani
|
8c48cb2b25
|
am 25661d68 : am 12997ecd : am 99ad06c2 : Merge "Change the location mode before applying restrictions" into lmp-dev
* commit '25661d68fd333bc52a2b81bda3b9c338bbf93686':
|
2014-09-19 04:45:51 +00:00 |
|
PauloftheWest
|
34cb17f11d
|
am 4a20069d : am 43454701 : am ebe496ea : Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
* commit '4a20069dc0acf2aec19e546c2521c594bf8a3fc0':
|
2014-09-19 04:45:49 +00:00 |
|
Jason Monk
|
35512106c9
|
am 710b8857 : am c8d9504e : am dc4818ab : Merge "Bring back auto-rotate to settings" into lmp-dev
* commit '710b8857a865371ddc24b18560b1045fb076cb73':
|
2014-09-19 04:45:47 +00:00 |
|
Paul Lawrence
|
cf69db21c0
|
am f88a60f0 : am 8826a64a : am 1f06a89f : Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit 'f88a60f09e1eaa989408c6b09f0b24ed876b9fb3':
|
2014-09-19 04:45:45 +00:00 |
|
Maurice Lam
|
4fb9b8cb94
|
am 2b193bc9 : am 8efe9278 : am def48d60 : Merge "[WifiSetup] Add shadow below header" into lmp-dev
* commit '2b193bc952460afe5dcc6d837abd77a850147529':
|
2014-09-19 04:45:43 +00:00 |
|
PauloftheWest
|
a2da46e329
|
am dbfc2fe1 : am 9fef5db8 : am bde55601 : Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
* commit 'dbfc2fe1b3205a005520dc4cc331d75ea41ead8b':
|
2014-09-19 04:45:42 +00:00 |
|
Fabrice Di Meglio
|
5dad606d76
|
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':
|
2014-09-19 04:45:41 +00:00 |
|
Dan Sandler
|
e28f4f7f83
|
am 2a124922 : am c8c5091f : am 3eac072b : Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
* commit '2a1249225f072915d3fd3b4464fe91ff727e2031':
|
2014-09-19 04:45:40 +00:00 |
|
PauloftheWest
|
a12082bad0
|
am 84acfc61 : am a8d4b005 : am d6cfeba9 : Merge "Updated Wifi Assistant to support RTL." into lmp-dev
* commit '84acfc617e669ffff87d183164298cef9ee421eb':
|
2014-09-19 04:45:39 +00:00 |
|
Baligh Uddin
|
fb321799ca
|
am 7ddba441 : (-s ours) am 25728d22 : (-s ours) am 48d3f0fd : (-s ours) Import translations. DO NOT MERGE
* commit '7ddba4418b89e3e66d97c842462fe39b396ed791':
|
2014-09-19 04:45:37 +00:00 |
|
Baligh Uddin
|
f0c35720ed
|
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
|
2014-09-19 04:45:36 +00:00 |
|
Wink Saville
|
1f4ead67c3
|
am ea569f48 : am 98365869 : ksd to lmp-sprout-dev
* commit 'ea569f481756ece8f3945de8f1d4630842e2cde8':
ksd to lmp-sprout-dev
|
2014-09-19 04:45:35 +00:00 |
|
PauloftheWest
|
b26eb21111
|
am 58da4c37 : am c932957d : am 0f01eeff : Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '58da4c37276ba1102a4a524b2a56c0b5db0e477f':
Removed an extraneous messge when pairing.
|
2014-09-18 16:24:56 +00:00 |
|
PauloftheWest
|
58da4c3727
|
am c932957d : am 0f01eeff : Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit 'c932957d4e56c756acea56c11347b4da35a30983':
Removed an extraneous messge when pairing.
|
2014-09-18 16:12:14 +00:00 |
|
PauloftheWest
|
c932957d4e
|
am 0f01eeff : Merge "Removed an extraneous messge when pairing." into lmp-dev
* commit '0f01eeff84ebdb93f24398d3adb5f214ae1ce2bb':
Removed an extraneous messge when pairing.
|
2014-09-18 16:00:59 +00:00 |
|
PauloftheWest
|
0f01eeff84
|
Merge "Removed an extraneous messge when pairing." into lmp-dev
|
2014-09-18 15:51:50 +00:00 |
|
Sander Alewijnse
|
61fc506eb3
|
am 0fe16796 : am c995e733 : am 4241b0a9 : Merge "Update targetSdkVersion check." into lmp-dev
* commit '0fe16796c55091ed7b75f75fdeed5b0e5b03da30':
Update targetSdkVersion check.
|
2014-09-18 12:07:39 +00:00 |
|
Sander Alewijnse
|
0fe16796c5
|
am c995e733 : am 4241b0a9 : Merge "Update targetSdkVersion check." into lmp-dev
* commit 'c995e73391bb4f46154d506f198ee4dec85bae4c':
Update targetSdkVersion check.
|
2014-09-18 11:56:32 +00:00 |
|
Sander Alewijnse
|
c995e73391
|
am 4241b0a9 : Merge "Update targetSdkVersion check." into lmp-dev
* commit '4241b0a9627e424adb897ec894a34ddce8fd77e3':
Update targetSdkVersion check.
|
2014-09-18 11:46:11 +00:00 |
|
Sander Alewijnse
|
4241b0a962
|
Merge "Update targetSdkVersion check." into lmp-dev
|
2014-09-18 11:36:31 +00:00 |
|