drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
269,169 Commits 1 Branch 0 Tags
Commit Graph

269169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurimas Liutikas
d2f712d22a Merge "Fix spelling error in Core App Quality docs." 2016-06-17 16:26:56 +00:00
Mikhail Naganov
d6a48d2dbe Merge "UsbMidiDevice: Clean up terminology and fix comments" 2016-06-17 15:32:02 +00:00
Mikhail Naganov
aab4c1ad48 UsbMidiDevice: Clean up terminology and fix comments 
When working with physical MIDI devices, an *input* stream is used
for reading from *output* port of the device, and vice versa. Thus,
using "input" and "output" without specifying whether it's a stream
or a port is confusing.

Clarify names of counter variables, and fix a couple of comments
that were incorrect due to this confusion. No functional changes.

Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2
 2016-06-17 08:04:28 -07:00
Gustav Sennton
8bfbc012cb Merge "resolve merge conflicts of 6cbf137 to master" 2016-06-17 10:49:54 +00:00
Gustav Sennton
fd222fc2f8 resolve merge conflicts of 6cbf137 to master 
Change-Id: Idc548a46e96464c11193cf8480d9fb4e07aa438f
 2016-06-17 09:38:55 +01:00
Seigo Nonaka
99a8e2faac Merge "Follow the minikin namespace changes" 2016-06-17 03:59:53 +00:00
Donghyun Cho
16a630d945 Merge "Add bluetooth folder type information to MediaDescription and MediaMetadata" 2016-06-17 02:03:14 +00:00
TreeHugger Robot
ff244e6c4c Merge "[multi-part] Eliminate 1k selection limit" 2016-06-17 01:33:49 +00:00
TreeHugger Robot
f604c83955 Merge "Quick fix for Files crashing on start up." 2016-06-17 01:28:53 +00:00
Sergei Vasilinetc
83b2cb1304 Merge "Test scene that mocks list view with text items faded on left edge." 2016-06-17 00:57:51 +00:00
Steve McKay
d81879670b [multi-part] Eliminate 1k selection limit 
* Save selection to disk, delete old selections on app startup.
* Do clipper work in background for copy/cut.
* Pull DragShadowBuilder out of DirFragment.
* Reorganize selection handling to avoid creation of large lists of objects.
* Eliminate getAll from selection, make it iterable, remove unused method.
* Avoid creating DocumentInfo instances for full selection when initiating drag and drop.

Next step will be to pass selection tokens to FileOperationService.

Change-Id: Ia3e30a88ebf328e5b045d06b0df15dbd26a01a42
(cherry picked from commit 69b63de63ddae8d1a3ad8fa49a0beb1ff6f921e1)
 2016-06-17 00:08:36 +00:00
sergeyv
06a62f6f53 Test scene that mocks list view with text items faded on left edge. 
Change-Id: I6159f02fa511241beaff4f0eb605c4f0bee360d1
 2016-06-16 15:58:49 -07:00
Ben Lin
dea1aa0cdd Quick fix for Files crashing on start up. 
Change-Id: I98df90b6bdf5caacb7565ead7051e507abfff23d
 2016-06-16 21:32:02 +00:00
TreeHugger Robot
4a618f5eac Merge "Poll jobs' status to update notifications." 2016-06-16 20:31:24 +00:00
TreeHugger Robot
10ce1da5ae Merge "Implementation of Right-click context menus for docs/files." 2016-06-16 20:21:17 +00:00
Aurimas Liutikas
08b1058612 Fix spelling error in Core App Quality docs. 
Bug:
https://code.google.com/p/android/issues/detail?id=213248

Change-Id: Idf83eb4fdc09bc3c78a7786b4bf11707178092c7
 2016-06-16 12:15:56 -07:00
Richard Ho
076539efdb Merge "merge fix" 2016-06-16 18:57:28 +00:00
Garfield, Tan
4a7aba23be Poll jobs' status to update notifications. 
Bug: 27249491
Change-Id: I8912c781582af1789c8f76dea06879a3dde75d34
 2016-06-16 18:41:30 +00:00
Ben Lin
9a621cbaca Implementation of Right-click context menus for docs/files. 
Bug: 24416336
Change-Id: I675baf4abf6308bc1f6c3b4171f7251b0f3fd6e4
(cherry picked from commit be70710de3e1507292381cd14a9e1c1343ff2524)
 2016-06-16 18:37:48 +00:00
Gustav Sennton
6cbf1376bc Merge \\"Support using uninstalled WebView packages as WebView implementation.\\" into nyc-dev am: e25c8532b6 
am: 939f8caec2

Change-Id: If40694c4a8ca87fe5467374abfc1f6de867d8733
 2016-06-16 17:53:03 +00:00
Gustav Sennton
939f8caec2 Merge \"Support using uninstalled WebView packages as WebView implementation.\" into nyc-dev 
am: e25c8532b6

Change-Id: Ie9f405765c146d21f1399037dd236d440902f0f9
 2016-06-16 17:46:53 +00:00
Gustav Sennton
e25c8532b6 Merge "Support using uninstalled WebView packages as WebView implementation." into nyc-dev 2016-06-16 17:40:10 +00:00
Yi Kong
9c5a79a389 Merge \\\\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\\" am: 1850851670 am: f5bdd8eae6 am: b72fa52282 
am: a05075f743

Change-Id: Idb7d4edd9de00025ae4af04c446654b1e7d8819b
 2016-06-16 17:26:48 +00:00
Makoto Onuki
092d4e91e8 Merge \\"Shortcut: Reset throttling upon inline reply\\" into nyc-mr1-dev am: 489bafbb4b 
am: 58b2258506

Change-Id: I7034cc9ef130c9dccfa35a8cb75940d717a2a15d
 2016-06-16 17:17:56 +00:00
Yi Kong
a05075f743 Merge \\\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\\" am: 1850851670 am: f5bdd8eae6 
am: b72fa52282

Change-Id: I512681e5a601e5d1e36979afef1fa3c443b2222c
 2016-06-16 17:14:43 +00:00
Dan Willemsen
45a7e7afad resolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc am: fd1854cdfa 
am: 04e9d830b0

Change-Id: I4add0a1b114c4e56343484acb9e855137e720be3
 2016-06-16 17:12:02 +00:00
Makoto Onuki
58b2258506 Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev 
am: 489bafbb4b

Change-Id: I5c8dc7f3c1e5860ea870d88b2ff7fc2a86a4ba39
 2016-06-16 17:10:42 +00:00
Yi Kong
b72fa52282 Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" am: 1850851670 
am: f5bdd8eae6

Change-Id: Iea16189bfbce1b11fa4a91501daba94c2c83a380
 2016-06-16 17:08:09 +00:00
Dan Willemsen
04e9d830b0 resolve merge conflicts of 20d55a7 to stage-aosp-master am: 5f551b3fdc 
am: fd1854cdfa

Change-Id: I6942aa753a512f0a24725de0ea72ed20c067ad15
 2016-06-16 17:07:15 +00:00
Makoto Onuki
489bafbb4b Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev 2016-06-16 17:05:55 +00:00
Yi Kong
f5bdd8eae6 Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" 
am: 1850851670

Change-Id: I6997e3b34d87cb091be99318ea1743c972ca1c84
 2016-06-16 17:02:37 +00:00
Dan Willemsen
fd1854cdfa resolve merge conflicts of 20d55a7 to stage-aosp-master 
am: 5f551b3fdc

Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9
 2016-06-16 17:01:55 +00:00
Mahaver Chopra
3c665dc9de Merge \\"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\\" into nyc-mr1-dev am: 186768150f 
am: d3a0f10b8d

Change-Id: I3cc8d0ff8cc97b57262edfb09c07fc91f06cf56c
 2016-06-16 17:00:06 +00:00
Dan Willemsen
5f551b3fdc resolve merge conflicts of 20d55a7 to stage-aosp-master 
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
 2016-06-16 09:54:28 -07:00
Mahaver Chopra
d3a0f10b8d Merge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into nyc-mr1-dev 
am: 186768150f

Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918
 2016-06-16 16:53:43 +00:00
Mahaver Chopra
186768150f Merge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into nyc-mr1-dev 2016-06-16 16:49:12 +00:00
Todd Kennedy
a4b22ba124 Merge \"Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: 092d961367\" into nyc-mr1-dev-plus-aosp 
am: b901e4c4e6

Change-Id: Id83cd214744a5114b518236bb7091d2578d47849
 2016-06-16 16:40:44 +00:00
Todd Kennedy
c38f457e7a Merge \\\"Make sure we\\\'re locked\\\" into nyc-dev am: 32d67fab83 am: e084a08ff5 
am: 5574a0618d

Change-Id: I20c7f3dd9ed062a470227ae8c7c7e305cb65730e
 2016-06-16 16:40:42 +00:00
Android Build Merger (Role)
b901e4c4e6 Merge "Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83 am: 092d961367" into nyc-mr1-dev-plus-aosp 2016-06-16 16:38:11 +00:00
Todd Kennedy
021a3899b3 Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83 
am: 092d961367

Change-Id: Ifbea2336bcb5a38ec71147e905a593b8b3f55416
 2016-06-16 16:37:44 +00:00
Todd Kennedy
5574a0618d Merge \\"Make sure we\\'re locked\\" into nyc-dev am: 32d67fab83 
am: e084a08ff5

Change-Id: I7cbdcd5d7e917fa290775260d3c30726948d4f4d
 2016-06-16 16:37:23 +00:00
Todd Kennedy
092d961367 Merge \"Make sure we\'re locked\" into nyc-dev 
am: 32d67fab83

Change-Id: I2f80a7af0ddd6f282cde6c8d9ea79e0c614fba6b
 2016-06-16 16:34:34 +00:00
Todd Kennedy
e084a08ff5 Merge \"Make sure we\'re locked\" into nyc-dev 
am: 32d67fab83

Change-Id: Iff90d36636b01542ed8a7e088f403b6554cbd91a
 2016-06-16 16:34:11 +00:00
Android Build Merger (Role)
dcb6e7d584 Merge "Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am: 53cf79e185 am: 75aee6f266" 2016-06-16 16:33:44 +00:00
Yi Kong
158ef35824 Merge \\"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\\" into nyc-dev-plus-aosp am: 53cf79e185 
am: 75aee6f266

Change-Id: I30a3bc53262cc1f27b3c745af2a9b6a4d6357649
 2016-06-16 16:33:13 +00:00
Andrei Stingaceanu
b49dcbf546 Merge "Keyboard shortcuts: A11Y fixes" 2016-06-16 16:29:24 +00:00
Richard Ho
a32baacf2c merge fix 
Change-Id: Ib937f672769dc19b8706c8a0b695ed8a08398df4
 2016-06-16 09:29:07 -07:00
Todd Kennedy
32d67fab83 Merge "Make sure we're locked" into nyc-dev 2016-06-16 16:22:54 +00:00
Yi Kong
75aee6f266 Merge \"Track libcore change 45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc-dev-plus-aosp 
am: 53cf79e185

Change-Id: I7444bfc95144d4d00c20347512a5a5fc0cceebc8
 2016-06-16 16:21:03 +00:00
Andrei Stingaceanu
b481701f41 Keyboard shortcuts: A11Y fixes 
* Letters are no more announced as capitals
* Focus now moves into the function key buttons (images)
* The keyboard shortcuts are not being verbalized individually
but instead the whole group is now verbalized in one go.

Bug: 29267887
Bug: 29259734
Bug: 29260915
Change-Id: Ie2cf519338cbb7d07c2d52b419dcf6b5a9e14147
 2016-06-16 17:20:41 +01:00