Commit Graph

16024 Commits

Author SHA1 Message Date
Elliott Hughes
1625fd5ac9 am bce031b0: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
* commit 'bce031b0ad16c0ba127627ca7231d872d23ce9c3':
2014-09-15 23:56:00 +00:00
PauloftheWest
45a14bb239 am 5dcec205: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
* commit '5dcec20557353a79aaa97e113583507b4f1a7433':
2014-09-15 23:55:59 +00:00
PauloftheWest
ca5ea573d7 am 91f76560: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
* commit '91f76560f80f006ce704f80f21400d91ffe43e89':
2014-09-15 23:55:58 +00:00
PauloftheWest
644a9f8130 am 9128659b: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
* commit '9128659be872890927291c30df781d3522d34a1e':
2014-09-15 23:55:57 +00:00
Andres Morales
096efb6b67 am a40a9a90: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
* commit 'a40a9a90b33fc3c51f08b03503354ab0e90ac0c2':
2014-09-15 23:55:51 +00:00
PauloftheWest
7ea894eada am 5c86c955: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '5c86c9551388e85b172a8305a0e9dd79ef025785':
2014-09-15 23:55:50 +00:00
Alan Viverette
71135c4f10 am ce7c0337: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit 'ce7c0337202bbf063a50e6436c246b35949ae0c3':
2014-09-15 23:55:49 +00:00
vandwalle
665bf2bf6a am 4d5ddf0c: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '4d5ddf0cce5cd5cafb5b23e3289a279c7540abca':
2014-09-15 23:55:48 +00:00
Alexandra Gherghina
d2288753e1 am c210a3f2: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
* commit 'c210a3f2c645ead7dee4c76662dc0da14ffb0bc1':
2014-09-15 23:55:47 +00:00
Carlos Valdivia
88c24fe1fb am b38b1b9e: am 690ce1b3: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
* commit 'b38b1b9ed63ed11ad845551300b0e48720dec843':
2014-09-15 23:55:46 +00:00
Jim Miller
12fb0406be am 75c782bf: am 1f389c19: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
* commit '75c782bf71057138375e5e11d815cde5c301e4de':
2014-09-15 23:55:45 +00:00
Alexandra Gherghina
14dfc45cdd am ba89f50a: am 80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev
* commit 'ba89f50ae7bf52ac7307723257cea8a3114b1a51':
2014-09-15 23:55:44 +00:00
Alexandra Gherghina
b897f8c534 am 70ad4ffd: am dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
* commit '70ad4ffd056c93338eb0e292fb6e675b40cb7434':
2014-09-15 23:55:43 +00:00
Amith Yamasani
e0313364bb am 45308ef2: am 30c50b15: Use correct API for badging
* commit '45308ef25d6b10f0a96bb32bfca1bdc6bb63725d':
2014-09-15 23:55:42 +00:00
Fabrice Di Meglio
1f5bcc18d2 am 17f556c7: am b5cc0134: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
* commit '17f556c7081e911268d5f9ed6bdc349b6ace6c65':
2014-09-15 23:55:41 +00:00
PauloftheWest
76ddec3185 am 5437b488: am c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
* commit '5437b488cb39538c2685013c0afc5ef798d3847e':
2014-09-15 23:55:40 +00:00
Barnaby James
a33056be9b am 1299446d: am 3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
* commit '1299446dee8d928ade9d3b7f2e433dbcf153551e':
2014-09-15 23:55:39 +00:00
Amith Yamasani
21980026de am ba790ca3: am 91648629: Merge "Follow API change for method name" into lmp-dev
* commit 'ba790ca3aceb0be89e5b0142e6a871cf2b7e03a0':
2014-09-15 23:55:38 +00:00
Svetoslav
02afa3d95d am 9b8912db: am fd3a3d79: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
* commit '9b8912dbee4b0acd6e7cfd8920e018695074a39e':
2014-09-15 23:55:37 +00:00
Svetoslav
3e11eddfe2 am 3c0385e4: am 527ecccc: Merge "Update Settings due to API changes." into lmp-dev
* commit '3c0385e46506ecbd8694f10bc041c53695a9e8bb':
2014-09-15 23:55:36 +00:00
Jorim Jaggi
d832fa1589 am 60b7e882: am f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
* commit '60b7e88289651ce846e179f663964602f469f4b6':
2014-09-15 23:55:35 +00:00
Alexandra Gherghina
aab02b8673 am da1e8c75: am 51712241: Fix typo in intent filter
* commit 'da1e8c75fb15821e073e6da09e7b897616232b0d':
2014-09-15 23:55:34 +00:00
Alexandra Gherghina
f1f0b2567b am 8378516b: am 9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
* commit '8378516b0bb4deefb68f30693f5bac2a3e1508ab':
2014-09-15 23:55:32 +00:00
Dan Sandler
d1234c882f am 6f0507ad: am 8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.
* commit '6f0507add78fe79212b8408651be74e59f7c9dfa':
2014-09-15 23:55:32 +00:00
Wink Saville
91a69d353f am 0e559d53: am aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
* commit '0e559d532c7cce810caa06ec6b69638e608b5998':
2014-09-15 23:55:31 +00:00
Fabrice Di Meglio
3ef7e17bec am a1c6288b: am 0535ed55: Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev
* commit 'a1c6288b137e4babbf1da3bc3a573a106e7a939d':
2014-09-15 23:55:30 +00:00
PauloftheWest
dd476d1629 am 4cebc121: am 4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
* commit '4cebc121506129eda1a6222bc19469956256643d':
2014-09-15 23:55:29 +00:00
Chris Wren
f686a1fd26 am 2ed0ea21: am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '2ed0ea2120d8356126f614655701382d1bf2a0fb':
2014-09-15 23:55:28 +00:00
Fabrice Di Meglio
5ae5557e51 am f475cfa3: am ed1175cf: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
* commit 'f475cfa354f478dd8ad5779ce9e04c551e4bc3ed':
2014-09-15 23:55:27 +00:00
Andres Morales
02655776a0 am db9745e4: am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev
* commit 'db9745e43a416afb6a52ff89013c2353c812faee':
2014-09-15 23:55:26 +00:00
Andres Morales
311244539a am d5723235: am 1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
* commit 'd572323580c0eabb59e9d63f4f3c58f1aa32c71b':
2014-09-15 23:55:25 +00:00
Baligh Uddin
2a106e2e93 am 19843ad1: (-s ours) am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '19843ad15e5b461ffb061c2c9478054f4cde70da':
2014-09-15 23:55:24 +00:00
Baligh Uddin
3b2d25707a am 184a7b4f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '184a7b4fd367a3d372efabc9aaf369b6ab8504d1':
  Import translations. DO NOT MERGE
2014-09-15 23:55:23 +00:00
PauloftheWest
0bc56b9c03 am 357e2826: am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
* commit '357e2826e166821e489607e9ae4006fed19cf57a':
2014-09-15 23:55:22 +00:00
PauloftheWest
fe0bf29ce5 am 0410a1e3: am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
* commit '0410a1e327f5276cc600ebda87ee0983f94b3891':
2014-09-15 23:55:21 +00:00
Fabrice Di Meglio
32434f0b63 am e758df57: am 5a8a75d9: Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
* commit 'e758df576a099920e00ec360267439b4a719c2ad':
2014-09-15 23:55:20 +00:00
Chris Wren
d351676e31 am dd95e098: am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit 'dd95e098f4e2b8d361df19964ab1ca6701840882':
2014-09-15 23:55:19 +00:00
Chris Wren
19f50c2e56 am cec40645: am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit 'cec406455239e26056687813dbdefcd9ceafa783':
2014-09-15 23:55:19 +00:00
Dan Sandler
5d29c6603e am 84176e56: am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev
* commit '84176e5691055d416bc6770704b00f2925a98318':
2014-09-15 23:55:16 +00:00
PauloftheWest
fed937f07a am 75b8535f: am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
* commit '75b8535f7d7329e3b3bf2743987abae850795845':
2014-09-15 23:55:15 +00:00
Zoltan Szatmary-Ban
d35829bcb3 am 34e537ed: am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
* commit '34e537ed277415530c4a811bfcd9a27a3f17bd00':
2014-09-15 23:55:14 +00:00
Zoltan Szatmary-Ban
be146343e4 am 4c035b8f: am 1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
* commit '4c035b8fe4618322d0332b92e6bc4c6e1d8f8cfb':
2014-09-15 23:55:13 +00:00
Alexandra Gherghina
131d34aecd am c24310c9: am 9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
* commit 'c24310c9638c972f7757b1f2356383730129fac6':
2014-09-15 23:55:07 +00:00
PauloftheWest
44581c7ffd am b448ea3a: am 7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
* commit 'b448ea3a338fa1c7149816d06c11cb0f7431e6bb':
2014-09-15 23:55:06 +00:00
Fabrice Di Meglio
1695f40e52 am 842feb89: am 52a48226: Merge "Fix bug #17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
* commit '842feb896192353083c7d0d0e8be422dc9124a76':
2014-09-15 23:55:05 +00:00
Fabrice Di Meglio
c1c10754a6 am 9786d300: am 815dc273: Merge "Fix bug #17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev
* commit '9786d300a1933d0d5716bc6aa6c9b56b6261bafb':
2014-09-15 23:55:04 +00:00
Wink Saville
c2c89bf82f am a535fcb5: am 418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev
* commit 'a535fcb5b3a3329d40214f9cf215c49b6b4719ad':
2014-09-15 23:55:03 +00:00
Fabrice Di Meglio
f6713c2a17 am bcd1ff97: am b5caa647: Merge "Fix bug #17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
* commit 'bcd1ff97448f9b9c0dd31f20ab7f3f8108e36b8d':
2014-09-15 23:55:02 +00:00
Dan Sandler
bb533452be am 2f64d506: am b58b5127: Fix links to notification settings activities.
* commit '2f64d506e0823a67d9985f25232ef4c17ac14082':
2014-09-15 23:55:01 +00:00
Vinit Deshpande
b89d110980 am 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
* commit '05725beb3565d1eecc3c59995f3c3642d85b5556':
2014-09-15 23:55:00 +00:00