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

199955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
e53ec64a8a am c2a737b9: am 479b0386: am ef70f8e4: Merge "Volume: Show row headers for cast streams." into mnc-dev 
* commit 'c2a737b984387e80a6f697191e673636236cfdee':
  Volume: Show row headers for cast streams.
 2015-06-10 17:59:46 +00:00
John Spurlock
c2a737b984 am 479b0386: am ef70f8e4: Merge "Volume: Show row headers for cast streams." into mnc-dev 
* commit '479b03862fdc4b101454c45b6449ad0ae54efb2f':
  Volume: Show row headers for cast streams.
 2015-06-10 17:47:58 +00:00
Michael Wright
19b8ed5c78 am 6849a678: am 299cd16b: am cc87cfa2: Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev 
* commit '6849a678bf5da623768e2ff6ef36daa0fb6c869c':
  Fix order of initialization arguments for obtained MotionEvents.
 2015-06-10 17:47:57 +00:00
Michael Wright
6849a678bf am 299cd16b: am cc87cfa2: Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev 
* commit '299cd16bf49b4a18f4a763038fe4c52671ba0306':
  Fix order of initialization arguments for obtained MotionEvents.
 2015-06-10 17:32:40 +00:00
John Spurlock
479b03862f am ef70f8e4: Merge "Volume: Show row headers for cast streams." into mnc-dev 
* commit 'ef70f8e426d3414ea9b66c07b15330631a466ed5':
  Volume: Show row headers for cast streams.
 2015-06-10 17:31:53 +00:00
Clara Bayarri
3108240a9e am 0dd41507: am dc904377: am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit '0dd41507d57c0533755653bb94de40a89eb5c734':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-10 17:26:20 +00:00
John Spurlock
ef70f8e426 Merge "Volume: Show row headers for cast streams." into mnc-dev 2015-06-10 17:24:13 +00:00
Michael Wright
299cd16bf4 am cc87cfa2: Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev 
* commit 'cc87cfa29c4b38d1f119bdce652918565b0fed0f':
  Fix order of initialization arguments for obtained MotionEvents.
 2015-06-10 17:20:58 +00:00
Jeff Sharkey
f476067321 am caecce24: am 30dd30de: am c7c8af67: Merge "Send added user serial numbers to vold." into mnc-dev 
* commit 'caecce24d794ba788d8ec8643eb0c9f6c34ddee1':
  Send added user serial numbers to vold.
 2015-06-10 17:20:58 +00:00
Geoff Mendal
21be5827f4 am dc66847f: (-s ours) am d709659b: (-s ours) am dc9ad9aa: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'dc66847fd247d0bc772635798a37e831f2c2dd86':
  Import translations. DO NOT MERGE
 2015-06-10 17:20:53 +00:00
Makoto Onuki
40d2fdf824 am f8d8a6c9: am d3acdf2a: am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'f8d8a6c9b37c284abdd9792f835f53f8d2a2f23f':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-10 17:20:47 +00:00
Clara Bayarri
0dd41507d5 am dc904377: am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit 'dc904377e7572fbead60d0fa66716de4e92770c2':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-10 17:13:53 +00:00
James Cook
17abb54edc am 6f02ba8c: am e2a0e450: am f22030d1: Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 
* commit '6f02ba8c82912f4b86324bce7d21edda7a0a0644':
  Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
 2015-06-10 17:13:41 +00:00
Paul Lawrence
cfce1b222e am f31bd09a: am c8c5884d: am 0c3aa483: Merge "Remove hex encoding and password adjusting now that patterns are \'1\' based" into mnc-dev 
* commit 'f31bd09afc1a2a98fe46d0091a943bf656cf909d':
  Remove hex encoding and password adjusting now that patterns are '1' based
 2015-06-10 17:13:35 +00:00
Lorenzo Colitti
06a22ebbe9 am bb2f798a: am 1f91eed0: am bc7b1a4c: Merge "When no Internet access is detected, display a notification first." into mnc-dev 
* commit 'bb2f798ae19cb7ef928274972ca9ad6c2c2c7eff':
  When no Internet access is detected, display a notification first.
 2015-06-10 17:13:22 +00:00
Keisuke Kuroyanagi
b68631486f am b9a8fc0c: am b5f1641a: am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit 'b9a8fc0cbff6128417a3a9246dd702a4de60dd60':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-10 17:13:17 +00:00
Jason Monk
fc2c511ca0 am e18f69fa: am 473da8b6: am b73390ac: Merge "Fix work apps showing as not installed for owner" into mnc-dev 
* commit 'e18f69fa219e1649b5ec2aa53f2a3059ae58101d':
  Fix work apps showing as not installed for owner
 2015-06-10 17:13:08 +00:00
Chet Haase
f6538c212e am f8aed458: am 15fb34d2: am 81728b86: Merge "Clarify docs for Animator.isStarted()" into mnc-dev 
* commit 'f8aed4589e1df9d1bf10bdc5adafc211e934b059':
  Clarify docs for Animator.isStarted()
 2015-06-10 17:12:38 +00:00
Chris Wren
a2acd4bc2b am 1d8d111a: am 7f588404: am 300a1416: Merge changes from topic \'tron\' into mnc-dev 
* commit '1d8d111a16bc696217162ddbd4cf08ca2bc5eb21':
  instrument notification longpress controls
  induct a bunch of new logging categories.
 2015-06-10 17:12:33 +00:00
Geoff Mendal
6275ec3d8d am 1faf2a6c: (-s ours) am 9cf2547d: (-s ours) am b381bcc1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1faf2a6c00d64378a832137d64090d457d381e9e':
  Import translations. DO NOT MERGE
 2015-06-10 17:12:28 +00:00
Geoff Mendal
6244b51b2b am def22de2: (-s ours) am 530595ac: (-s ours) am 36eb6d5f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'def22de21a69856f7dacb2c0cb30261e6649644b':
  Import translations. DO NOT MERGE
 2015-06-10 17:12:23 +00:00
Geoff Mendal
9141570574 am 1e557219: (-s ours) am e3b1dc3c: (-s ours) am b6c026be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '1e557219faa252d9bee697acd3cb1f5f8b2c76fe':
  Import translations. DO NOT MERGE
 2015-06-10 17:12:18 +00:00
Geoff Mendal
d958f48c8e am 2fc53f85: (-s ours) am 68c80fcc: (-s ours) am 1947d9f5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '2fc53f85d7dc11b216ebd3a692dff22bdfef306f':
  Import translations. DO NOT MERGE
 2015-06-10 17:12:13 +00:00
Neil Fuller
afcbb4bb91 am c15b4bcf: am bbb06b32: am 8e095594: Merge "Stop showing long names for local timezones when it is ambiguous" into mnc-dev 
* commit 'c15b4bcf3d42b90c955bc3a19bc7eb5b23cad361':
  Stop showing long names for local timezones when it is ambiguous
 2015-06-10 17:12:07 +00:00
Andrew Flynn
139c456e4d am 4fda24fe: am c570a629: am da9bbf72: Merge "notifyCarrierNetworkChange:TelephonyManager->CarrierService" into mnc-dev 
* commit '4fda24fece717f4deded74977753e9aa6caf551a':
  notifyCarrierNetworkChange:TelephonyManager->CarrierService
 2015-06-10 17:12:01 +00:00
Andrei Stingaceanu
3210869291 am 52243ad3: (-s ours) am 15f4dd72: resolved conflicts for merge of 1c96a941 to mnc-ub-dev 
* commit '52243ad30da4d3c1ac27f8f8842d3d0468b6c5e3':
  Completely remove ExtractActionMode from ExtractEditLayout
 2015-06-10 17:11:56 +00:00
Michael Wright
cc87cfa29c Merge "Fix order of initialization arguments for obtained MotionEvents." into mnc-dev 2015-06-10 17:06:16 +00:00
Clara Bayarri
dc904377e7 am 89124000: Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 
* commit '89124000c618f24b948505cd79f654aacbdff957':
  Fix Floating tool bar flickers after long pressing on empty region.
 2015-06-10 17:00:48 +00:00
Jeff Sharkey
caecce24d7 am 30dd30de: am c7c8af67: Merge "Send added user serial numbers to vold." into mnc-dev 
* commit '30dd30de20b7b82197eed27204bd60da34d8711e':
  Send added user serial numbers to vold.
 2015-06-10 17:00:05 +00:00
Geoff Mendal
dc66847fd2 am d709659b: (-s ours) am dc9ad9aa: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'd709659be91bf8da10121626a499a4c9b528d016':
  Import translations. DO NOT MERGE
 2015-06-10 17:00:00 +00:00
Makoto Onuki
f8d8a6c9b3 am d3acdf2a: am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'd3acdf2a4814c2a476faf444d03887f162235a78':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-10 16:59:55 +00:00
Jeff Sharkey
30dd30de20 am c7c8af67: Merge "Send added user serial numbers to vold." into mnc-dev 
* commit 'c7c8af6726eda245288ab1af720297c60cd1be54':
  Send added user serial numbers to vold.
 2015-06-10 16:51:22 +00:00
Geoff Mendal
d709659be9 am dc9ad9aa: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit 'dc9ad9aaee5bef44888cbebb035635a30b548cb8':
  Import translations. DO NOT MERGE
 2015-06-10 16:51:17 +00:00
Makoto Onuki
d3acdf2a48 am e6d8ffb4: Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 
* commit 'e6d8ffb40f555bbb3b88a3544616de28426e75a1':
  Add more result extras for ACTION_GET_PERMISSIONS_COUNT
 2015-06-10 16:51:12 +00:00
Clara Bayarri
89124000c6 Merge "Fix Floating tool bar flickers after long pressing on empty region." into mnc-dev 2015-06-10 16:50:46 +00:00
Jeff Sharkey
c7c8af6726 Merge "Send added user serial numbers to vold." into mnc-dev 2015-06-10 16:44:52 +00:00
Geoff Mendal
dc9ad9aaee Merge "Import translations. DO NOT MERGE" into mnc-dev 2015-06-10 16:44:10 +00:00
Jeff Sharkey
bcd262da4b Send added user serial numbers to vold. 
vold will eventually use the serial numbers to clean up stale user
directories when mounting private storage devices.

Bug: 20275572
Change-Id: I37f6c10026608dfa6484598420db5a5870330d25
 2015-06-10 09:41:17 -07:00
Makoto Onuki
e6d8ffb40f Merge "Add more result extras for ACTION_GET_PERMISSIONS_COUNT" into mnc-dev 2015-06-10 16:38:55 +00:00
Geoff Mendal
43fbaf34c5 Import translations. DO NOT MERGE 
Change-Id: I6645c53b1ec2f48524d162e7c9a771e0684e3628
Auto-generated-cl: translation import
 2015-06-10 09:37:36 -07:00
Geoff Mendal
4fdc38640a Merge "Import translations. DO NOT MERGE" 2015-06-10 16:34:32 +00:00
Geoff Mendal
f88f3ca583 Import translations. DO NOT MERGE 
Change-Id: I7a72216af4417c0a3ac5d4f1833cadeabac6f4eb
Auto-generated-cl: translation import
 2015-06-10 09:31:09 -07:00
James Cook
6f02ba8c82 am e2a0e450: am f22030d1: Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 
* commit 'e2a0e4504897d00cc8600959df636d9675ca63a8':
  Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
 2015-06-10 16:06:14 +00:00
Paul Lawrence
f31bd09afc am c8c5884d: am 0c3aa483: Merge "Remove hex encoding and password adjusting now that patterns are \'1\' based" into mnc-dev 
* commit 'c8c5884d976f599efd3aef3b64aa42f3072947b1':
  Remove hex encoding and password adjusting now that patterns are '1' based
 2015-06-10 16:06:09 +00:00
Lorenzo Colitti
bb2f798ae1 am 1f91eed0: am bc7b1a4c: Merge "When no Internet access is detected, display a notification first." into mnc-dev 
* commit '1f91eed0485a69a2493833085a12b2f9ba46bd87':
  When no Internet access is detected, display a notification first.
 2015-06-10 15:56:28 +00:00
Keisuke Kuroyanagi
b9a8fc0cbf am b5f1641a: am 136a462c: Merge "Revert "Fix: Crash when modifying text while using drag accelerator."" into mnc-dev 
* commit 'b5f1641a34bd70b0758d25a547229234a646c6ef':
  Revert "Fix: Crash when modifying text while using drag accelerator."
 2015-06-10 15:56:23 +00:00
James Cook
e2a0e45048 am f22030d1: Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 
* commit 'f22030d1c59aca4f9ad2af7d4c4d646b0b619f27':
  Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation
 2015-06-10 15:56:14 +00:00
Paul Lawrence
c8c5884d97 am 0c3aa483: Merge "Remove hex encoding and password adjusting now that patterns are \'1\' based" into mnc-dev 
* commit '0c3aa4834efd91ea9559486fed1d613fd4289969':
  Remove hex encoding and password adjusting now that patterns are '1' based
 2015-06-10 15:56:09 +00:00
James Cook
f22030d1c5 Merge "Fix ActionButton.CloseMode minWidth to match Toolbar.Button.Navigation" into mnc-dev 2015-06-10 15:47:23 +00:00
Paul Lawrence
0c3aa4834e Merge "Remove hex encoding and password adjusting now that patterns are '1' based" into mnc-dev 2015-06-10 15:42:42 +00:00