Commit Graph

23480 Commits

Author SHA1 Message Date
Nick Kralevich
2aadd76a88 am 35e08b44: am 8a85dcc9: (-s ours) am 1adca55f: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
* commit '35e08b441c308110b91df03cb2d456f05a2bdfa4':
2015-08-27 20:20:43 +00:00
Jason Monk
a9d5776a23 am d50c024c: am 25adfb00: (-s ours) am f61ead7a: Make sure accessibility service desc isn\'t clickable
* commit 'd50c024c109f86be5dcb637c336acdf99b2cfa2d':
2015-08-27 20:20:41 +00:00
Dianne Hackborn
483bdc171f am e885c27c: am 50cb6411: (-s ours) am f426126a: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev
* commit 'e885c27c08acb3a01388d597ffda9c15ce49c9a2':
2015-08-27 20:20:36 +00:00
Chris Tate
938a03c676 am 8c2593e0: am 5977cfdf: (-s ours) am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
* commit '8c2593e0da66de2996630438d97d40d6104036ad':
2015-08-27 20:20:29 +00:00
Prem Kumar
c69e77071d am dc30961b: am 0694de93: (-s ours) am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
* commit 'dc30961b4354c9fa24bc810f10b4136068c56335':
2015-08-27 20:20:26 +00:00
Maurice Lam
b93d972442 am 98d6d7c9: am 01495108: (-s ours) am 87fadbe6: [Fingerprint] Help text for backup screen lock
* commit '98d6d7c9d4ec59c78fa3106d65e0805d54f8fde8':
2015-08-27 20:20:24 +00:00
Geoff Mendal
a92e7c5342 am ad6eb955: (-s ours) am a5af1375: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
* commit 'ad6eb955e4f7f2cc7950e8f8cc0446fa6fc1060e':
2015-08-27 20:20:22 +00:00
Vinit Deshpande
319669f62e am ac23c640: am 96ae93e4: (-s ours) am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
* commit 'ac23c640b53d6353504946e76b9a004c456e0b5c':
2015-08-27 20:20:19 +00:00
Jim Miller
7989230e1f am 6b120f32: am fe87f19b: (-s ours) am efaa19d9: Fix fingerprint enrolling bug.
* commit '6b120f324e19bbea4b855050c8c5f3948e913af0':
2015-08-27 20:20:17 +00:00
Maurice Lam
127bcbf35d am d9e42d64: am e1548aba: (-s ours) am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
* commit 'd9e42d64ea649f94a2fd756aaef7417b2f9bcca4':
2015-08-27 20:20:15 +00:00
Geoff Mendal
230eebf305 am 78ed71c6: (-s ours) am b02410c4: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
* commit '78ed71c68a246d34154a03b7e5661e73dbd97e26':
2015-08-27 20:20:13 +00:00
Jeff Sharkey
a734dd52e8 am 10957201: am bf49bdf9: (-s ours) am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
* commit '109572010bb3875bf4b8155743c4f00716f2cdf2':
2015-08-27 20:20:11 +00:00
Maurice Lam
348740aeec am 605396b5: am 0074510a: (-s ours) am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
* commit '605396b5429ffe6c491cb3649c95e661f02d1f52':
2015-08-27 20:20:09 +00:00
Geoff Mendal
6c6f3e0443 am 02b262d4: (-s ours) am 197cfdbd: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
* commit '02b262d4bc1c599f32eec0d63aa60f46a24efe74':
2015-08-27 20:20:07 +00:00
Fyodor Kupolov
c9b7c7d19a am bf68f8d4: am b3fd5e17: (-s ours) am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev
* commit 'bf68f8d4c89e38667c607ecadd1cc36a0b6362ce':
2015-08-27 20:20:05 +00:00
Jorim Jaggi
197056a1b5 am 3ee1bc7d: am 93eff27e: (-s ours) am 92f9bdc6: Merge "Add dialog to confirm last fingerprint removal" into mnc-dev
* commit '3ee1bc7d2193b1bbbfcca84669032e7a71d88504':
2015-08-27 20:20:02 +00:00
Jeff Sharkey
58efb78249 am d4dc3e3b: am 43c41edf: (-s ours) am bb9d6b90: Merge "Refresh after clearing, tweak warn threshold." into mnc-dev
* commit 'd4dc3e3b1e4a1a728de5d6d0914066c921d96695':
2015-08-27 20:20:00 +00:00
Billy Lau
9f65e6aa4f am aaa1621b: am 62d04c00: (-s ours) am eb372c93: Merge "Bug: 22718745 Intents to \'draw over other apps\' should go direct to the package\'s page instead of the top level one" into mnc-dev
* commit 'aaa1621b6bb3ef212465fb9770ba9998f39554b0':
2015-08-27 20:19:56 +00:00
Jason Monk
fa1574895c am 6e27d595: am 2ff120a3: (-s ours) am 19128bd1: Extend char limit by small amount
* commit '6e27d59553400aca605993588d78e60ee5968221':
2015-08-27 20:19:54 +00:00
Geoff Mendal
b64b4a9b53 am c60a5923: (-s ours) am 149ceebc: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
* commit 'c60a59235d0805e2f18c15956c3520f587a29e32':
2015-08-27 20:19:52 +00:00
Geoff Mendal
78194e545d am 4475b771: (-s ours) am e6f7a8bf: (-s ours) am 53f771d8: (-s ours) Import translations. DO NOT MERGE
* commit '4475b7712f75e1d6d1adf6064b35f7818c66081a':
2015-08-27 20:19:49 +00:00
Jorim Jaggi
27016b1bd2 am 8f212848: am 7b48a1c6: (-s ours) am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev
* commit '8f21284807ea33980c4f3ef361ab240a097c9b63':
2015-08-27 20:19:48 +00:00
Fyodor Kupolov
6d9d79a5e5 am c4f1eaaf: am 2c5f5921: (-s ours) am 2731a18f: Merge "brightness status not refresh in powercontrol widget"
* commit 'c4f1eaaf0373ab343e58ed8f73b2777255bbb9d0':
2015-08-27 20:19:46 +00:00
Maurice Lam
4db3006330 am aa69ebb5: am 862343bc: (-s ours) am 3760e5e7: Merge "[ZenMode] Align text to viewStart in remove dialog" into mnc-dev
* commit 'aa69ebb566623a97cf263d1024a5710179522ba4':
2015-08-27 20:19:44 +00:00
Julia Reynolds
605851ee06 am 1d85676b: am 4254518a: (-s ours) am 00b5488c: Merge "Change assist app warning message text" into mnc-dev
* commit '1d85676b5740b941077ccbf3ea6ec8329d72a77c':
2015-08-27 20:19:42 +00:00
Julia Reynolds
9a11cee2ba am 1281463f: am 06e59246: (-s ours) am ae422fd0: Merge "Change \'data\' label to \'data usage\'." into mnc-dev
* commit '1281463f6d55982cf82038c7d43b1862633ab35c':
2015-08-27 20:19:40 +00:00
Chris Wren
f33ba7422d am 54aedb67: am 3605c435: (-s ours) am 2a56d7f2: Merge "fix InactiveApps instrumentation" into mnc-dev
* commit '54aedb67fdf8359603b75df903b8e0eb6c002300':
2015-08-27 20:19:38 +00:00
Martijn Coenen
2dcd2bb4e7 am 68da3bcb: am 3e7d3faf: (-s ours) am edb2668c: Merge "Add contactless symbol to NFC resources." into mnc-dev
* commit '68da3bcbd5641d6078e9a37f36690d33bd5c4455':
2015-08-27 20:19:36 +00:00
Julia Reynolds
945f6e211c am d16f564d: am 0a52b7b3: (-s ours) am 300d6fd9: Merge "Use pattern visibility setting on confirm pattern screen." into mnc-dev
* commit 'd16f564d0b2b621e107ac896f041dbf23c149126':
2015-08-27 20:19:33 +00:00
Julia Reynolds
cbf42e6364 am 468bf839: am 72bb3a69: (-s ours) am f889faaf: Merge "Bump string char limit." into mnc-dev
* commit '468bf8393ba8ccb007c7a144afcce7f8c157eade':
2015-08-27 20:19:31 +00:00
Martijn Coenen
82a158ac41 am 67d37ec8: am 274d9246: (-s ours) am 8e7b9cf9: Merge "Fix tap & pay strings." into mnc-dev
* commit '67d37ec89307d959894f0e1065a8334cf72b9f0a':
2015-08-27 20:19:29 +00:00
Zach Johnson
145338a28f am 965dd0f3: am 4fd8d1e1: (-s ours) am a425e864: Merge "Hide apps in the battery menu that have COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED" into mnc-dev
* commit '965dd0f3b4df454a4356a6a84d7c5a0f5179f556':
2015-08-27 20:19:26 +00:00
Julia Reynolds
bcacf33d88 am aa139449: am 1ae73faf: (-s ours) am 5b5ed310: Merge "Prevent crash in app memory updater." into mnc-dev
* commit 'aa13944984e77d4ccab8f21e48512ad3de32cb48':
2015-08-27 20:19:24 +00:00
Julia Reynolds
201c4f6d83 am 3ae4f044: am b5063920: (-s ours) am feeae4cd: Merge "Hide usage graph on app usage details pages." into mnc-dev
* commit '3ae4f044889f2b773ac96010791a0cd79b926702':
2015-08-27 20:19:23 +00:00
Jorim Jaggi
ede31bb1b0 am 0a3fa3d9: am 9fd7d6fd: (-s ours) am 5458688c: Merge "Make fingerprint error text a live region" into mnc-dev
* commit '0a3fa3d9a37ed309789f7efb88b52dca08e87ec6':
2015-08-27 20:19:20 +00:00
Jorim Jaggi
d87f374944 am 111e82df: am 4088cef8: (-s ours) am 74af384c: Merge "Adjust enrollment UI for sw400 devices" into mnc-dev
* commit '111e82dfce39f1a6fc9cdd18e27bcb4e219341b6':
2015-08-27 20:19:18 +00:00
Jorim Jaggi
258b6b68d1 am 4fdd5cc6: am a77130f7: (-s ours) am 4d9f5c91: Merge "Don\'t use screenshot if structure is disabled (2/2)" into mnc-dev
* commit '4fdd5cc6e0814a2ee06ce28bf9f1d1c613d142be':
2015-08-27 20:19:16 +00:00
Jorim Jaggi
e69c3a4d11 am 3ae8ae37: am 69941efa: (-s ours) am 730389bd: Merge "Adjust choose assist app string" into mnc-dev
* commit '3ae8ae371f0361927753153540aa0b3232cafb18':
2015-08-27 20:19:14 +00:00
Jorim Jaggi
daf678ae3e am 2531fe7c: am e4e8bb34: (-s ours) am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev
* commit '2531fe7c4501a5c44534850e2670dfe1e77cb3f3':
2015-08-27 20:19:12 +00:00
Selim Cinek
451c7f11a1 am da7bbe68: am d2b6e1ac: (-s ours) am 596ce9ba: Merge "Autocapitalizing the fingerprint names now" into mnc-dev
* commit 'da7bbe68101413a44f0cf985b22e92ab280b2d26':
2015-08-27 20:19:09 +00:00
Selim Cinek
e33a8db52c am 5aae3cae: am 412eb5df: (-s ours) am a8c7c8c8: Merge "Added content description for the fingerprint icon" into mnc-dev
* commit '5aae3caea2b0bac5e6e03f8b5fe38914d1b05ec2':
2015-08-27 20:19:07 +00:00
Selim Cinek
532219d2fd am 73de309d: am e0f552c1: (-s ours) am 95ddf903: Merge "Adapted a string in the fingerprint enrollment flow" into mnc-dev
* commit '73de309dc9d737cb6461b4980cabacbec3b02c2c':
2015-08-27 20:19:05 +00:00
Jorim Jaggi
29de51d236 am ff53e141: am 607e7963: (-s ours) am 58d1995c: Merge "Move PIN/Pattern appear animation to RenderThread (2/2)" into mnc-dev
* commit 'ff53e1415a45c36f2328daa2c089691098acbb82':
2015-08-27 20:19:02 +00:00
Jason Monk
c397c877bd am 5c87cdd8: am 9a5dc80d: (-s ours) am 3b521b60: Merge "Battery summary - tint uid 0 icon" into mnc-dev
* commit '5c87cdd8a7970500921b263103867a46cd7ccff9':
2015-08-27 20:19:00 +00:00
Jason Monk
55f105fec3 am c3c9dbd3: am 9d5907d0: (-s ours) am 08cb3983: Merge "Update battery optimization strings" into mnc-dev
* commit 'c3c9dbd31eb421096913f8794e95e8d039d6dc5e':
2015-08-27 20:18:57 +00:00
Sanket Padawe
26aeddcffb am 759e3fab: am 9cbb3549: (-s ours) am ca258251: Merge "Fix issues in AP dialog arising after clicking on AP preferences." into mnc-dev
* commit '759e3fab0b8ec479845a217aede3b683ef785f97':
2015-08-27 20:18:55 +00:00
Julia Reynolds
201b9403b2 am ff5823f5: am 0b674961: (-s ours) am 9a1c0dce: Handle app uninstall via Storage & USB.
* commit 'ff5823f58ae938155bdb7338bbbddc6ef0419bed':
2015-08-27 20:18:52 +00:00
Geoff Mendal
588b3f1541 am b1c078f4: (-s ours) am a8b7c118: (-s ours) am e37e1232: (-s ours) Import translations. DO NOT MERGE
* commit 'b1c078f479a8c97eff6dde9306742cb4b76b959d':
2015-08-27 20:18:46 +00:00
Adrian Roos
6b189b90b0 am c667011f: am d6dc0bb4: (-s ours) am 38c9b9eb: Update FRP warning to spec
* commit 'c667011fad3eb0ff62e495ced2d861679c1a8c80':
2015-08-27 20:18:41 +00:00
Maurice Lam
6d1affd9d3 am d04a354f: am 27165dc3: (-s ours) am 36c76014: Merge "[Fingerprint] Show skip button during SUW" into mnc-dev
* commit 'd04a354f3ee98fd133b96fd083846a5ab5f9419f':
2015-08-27 20:18:38 +00:00