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

162266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
ad54e37f3d am a036088d: (-s ours) am c1f4c0fe: (-s ours) am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'a036088d8e10b3c10b06bb5c73aa885a8eb061ec':
  Import translations. DO NOT MERGE
 2014-10-10 04:27:04 +00:00
Quddus Chong
45d4e141d4 am 39dd5163: am 00c1c564: am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '39dd5163e7c9695c65d728828778de4648903f62':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-10 04:27:00 +00:00
Mike Lockwood
253ad526c1 am 500913ee: am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit '500913ee002eb8a6a418732f3a6d7549ac046eaf':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-10 04:26:55 +00:00
Eino-Ville Talvala
874d982c4d am 58d5a8b6: am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit '58d5a8b646ed479d12109a94b9ebd37be79e4662':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-10 04:26:51 +00:00
Svetoslav
73a02f4337 am 202ff5f2: am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '202ff5f2e0c53ea68d40104f34084cb39b9906f1':
  Restored widget provider id not properly updated.
 2014-10-10 04:26:46 +00:00
Dianne Hackborn
75a6e82bcc am 36ae48a8: am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '36ae48a850bade17d485cb49dd40a3f11f667ad4':
  Put in real "code" (aka marketing) name.
 2014-10-10 04:26:40 +00:00
Deepanshu Gupta
7c5020db4f am d8497e45: am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit 'd8497e45c72fbb27961d096499984906af19d35f':
  Exclude KXmlParser from LayoutLib.
 2014-10-10 04:26:33 +00:00
Jeff Sharkey
1855d0da8b am 8a1df415: am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '8a1df4154d0e1296a3f03fa2aaf852ac08f68f36':
  Bring along more ApplicationInfo fields.
 2014-10-10 04:26:29 +00:00
Geoff Mendal
3853a21f01 am 52940c2b: (-s ours) am 437e5c9c: (-s ours) am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '52940c2bcfa264a45875d36860de3903e336e740':
  Import translations. DO NOT MERGE
 2014-10-10 04:26:24 +00:00
Filip Gruszczynski
1e788daf6a am 6c995613: am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '6c99561384dafaa080b804078e55c6167efe0e11':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-10 04:26:18 +00:00
Alan Viverette
3ad81eee72 am 2eda6f07: am 466f5581: Merge "Slow down ripple background fade in from press" into lmp-mr1-dev 
* commit '2eda6f078cd6014a860903f515affa4d6a58748a':
  Slow down ripple background fade in from press
 2014-10-09 22:23:16 +00:00
Alan Viverette
cda9841a8b am f1d23f9c: am fe087d38: Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 
* commit 'f1d23f9cc1992b936c98e2882eb5a3d766129fe7':
  Fix invalid bounds detection in ExploreByTouchHelper
 2014-10-09 22:23:11 +00:00
Elliott Hughes
90e01b3b40 am b68fe9e5: am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'b68fe9e5f355a3d13ed74cb89fb3e3818b356cee':
  Track change to private libcore data structure.
 2014-10-09 18:20:23 +00:00
Elliott Hughes
b68fe9e5f3 am ae1b6805: Merge "Track change to private libcore data structure." 
* commit 'ae1b6805a2609759186af8d7131c4750e011019a':
  Track change to private libcore data structure.
 2014-10-09 18:13:54 +00:00
Elliott Hughes
ae1b6805a2 Merge "Track change to private libcore data structure." 2014-10-09 18:08:58 +00:00
Geoff Mendal
a036088d8e am c1f4c0fe: (-s ours) am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'c1f4c0fefebfb296846e88324c1bb7dee6b5c876':
  Import translations. DO NOT MERGE
 2014-10-09 13:17:14 +00:00
Quddus Chong
39dd5163e7 am 00c1c564: am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '00c1c564b0edca42093febf9e3f789cb9ae75d9d':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-09 13:17:10 +00:00
Mike Lockwood
500913ee00 am cf1e5c39: am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit 'cf1e5c3912a4d3fb0dd0dae80e049fa470e29581':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-09 13:17:06 +00:00
Eino-Ville Talvala
58d5a8b646 am 7e7a14c5: am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit '7e7a14c541aba0824e37f51920e988dc38e9a34f':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 13:17:01 +00:00
Svetoslav
202ff5f2e0 am fc324ddf: am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit 'fc324ddf0593b21694b7fcf315c6da607ff38805':
  Restored widget provider id not properly updated.
 2014-10-09 13:16:45 +00:00
Dianne Hackborn
36ae48a850 am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:16:40 +00:00
Deepanshu Gupta
d8497e45c7 am 0a61c7ee: am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '0a61c7ee4a94326b7524d58f456973b68ac62d35':
  Exclude KXmlParser from LayoutLib.
 2014-10-09 13:16:36 +00:00
Jeff Sharkey
8a1df4154d am b4248495: am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit 'b424849533ac369c41a824510a8f3914f62ed2c6':
  Bring along more ApplicationInfo fields.
 2014-10-09 13:16:31 +00:00
Geoff Mendal
52940c2bcf am 437e5c9c: (-s ours) am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '437e5c9c9a994efe795e72ffe4721055f077c4cf':
  Import translations. DO NOT MERGE
 2014-10-09 13:16:27 +00:00
Filip Gruszczynski
6c99561384 am 301d2276: am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '301d2276f9d5208da7036b465203575a5eac8936':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-09 13:16:23 +00:00
Geoff Mendal
c1f4c0fefe am e73bb6e0: (-s ours) am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'e73bb6e059dbd073b09246471b332b6b0e72f191':
  Import translations. DO NOT MERGE
 2014-10-09 13:04:23 +00:00
Quddus Chong
00c1c564b0 am 10be6fed: am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '10be6fed6629a3f977d3b693f70868df3c5d1c0c':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-09 13:04:18 +00:00
Mike Lockwood
cf1e5c3912 am cf61b3f6: am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit 'cf61b3f6e653749b3d04eb531d76918e88eb98bd':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-09 13:04:13 +00:00
Eino-Ville Talvala
7e7a14c541 am eeec4b9e: am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'eeec4b9ebc15545e59985eab29385157cbbd8e9f':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 13:04:08 +00:00
Svetoslav
fc324ddf05 am 2f2864b7: am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '2f2864b7b13ee4846a1d95c2c03eeb5752629f21':
  Restored widget provider id not properly updated.
 2014-10-09 13:03:28 +00:00
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Deepanshu Gupta
0a61c7ee4a am 985d59d7: am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '985d59d7e3e676a02892b2a5e131510a993b3449':
  Exclude KXmlParser from LayoutLib.
 2014-10-09 13:03:13 +00:00
Jeff Sharkey
b424849533 am b01a5ba2: am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit 'b01a5ba2b7c1bc22e30d6cc16c30f8e1215701cd':
  Bring along more ApplicationInfo fields.
 2014-10-09 13:03:07 +00:00
Geoff Mendal
437e5c9c9a am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'db5b94d4050c169cf1c41aca8af83b1c0225c037':
  Import translations. DO NOT MERGE
 2014-10-09 13:03:02 +00:00
Filip Gruszczynski
301d2276f9 am 49e2371a: Merge "Log exception when creating Activity in ActivityUnitTestCase." into lmp-sprout-dev 
* commit '49e2371a271e33bbe8177c3f87d5f3b8ef7f59c5':
  Log exception when creating Activity in ActivityUnitTestCase.
 2014-10-09 13:03:01 +00:00
Geoff Mendal
e73bb6e059 am 49c5ddd6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '49c5ddd67793735a2d6fc036614cdfab944d56f6':
  Import translations. DO NOT MERGE
 2014-10-09 03:06:49 +00:00
Quddus Chong
10be6fed66 am 8f25f390: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. 
* commit '8f25f390e515be9783e8cce913f8de051e097419':
  docs: Changed date of GMS v6.1 (Manchego) release to October 2014.
 2014-10-09 03:03:14 +00:00
Mike Lockwood
cf61b3f6e6 am 3910f53c: Merge "bootanimation: Tweak parameters for pcm_open for playing boot sounds." into lmp-dev 
* commit '3910f53c5ebccbe64ab768591dc7c377f1eb0153':
  bootanimation: Tweak parameters for pcm_open for playing boot sounds.
 2014-10-09 03:03:09 +00:00
Eino-Ville Talvala
eeec4b9ebc am ef773e35: Merge changes Id09663d8,Ie88f3750 into lmp-dev 
* commit 'ef773e3569969592fb220b7ccc49dafcabfdd67a':
  Camera2: Docs cleanup, especially units and range
  camera2: Update docs only for legacy devices
 2014-10-09 03:02:35 +00:00
Alan Viverette
2eda6f078c am 466f5581: Merge "Slow down ripple background fade in from press" into lmp-mr1-dev 
* commit '466f5581ef1b45e601dc40db53a5ebd2d465ae14':
  Slow down ripple background fade in from press
 2014-10-09 00:56:13 +00:00
Alan Viverette
466f5581ef Merge "Slow down ripple background fade in from press" into lmp-mr1-dev 2014-10-09 00:51:19 +00:00
Alan Viverette
f1d23f9cc1 am fe087d38: Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 
* commit 'fe087d38a8cca08680e659c57176b3afd735ea90':
  Fix invalid bounds detection in ExploreByTouchHelper
 2014-10-09 00:37:22 +00:00
Alan Viverette
fe087d38a8 Merge "Fix invalid bounds detection in ExploreByTouchHelper" into lmp-mr1-dev 2014-10-09 00:32:56 +00:00
Svetoslav
2f2864b7b1 am 3dd06d90: Merge "Restored widget provider id not properly updated." into lmp-dev 
* commit '3dd06d9005bd572a3b012b3a2b27adfa94533144':
  Restored widget provider id not properly updated.
 2014-10-09 00:15:02 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Deepanshu Gupta
985d59d7e3 am 908a4f9a: am 4f133894: Exclude KXmlParser from LayoutLib. 
* commit '908a4f9a4372a9627e821b5800936095b0f0b5b0':
  Exclude KXmlParser from LayoutLib.
 2014-10-09 00:14:31 +00:00
Jeff Sharkey
b01a5ba2b7 am 562262cc: Merge "Bring along more ApplicationInfo fields." into lmp-dev 
* commit '562262cc89838529316ff2f3e511c0d876b08677':
  Bring along more ApplicationInfo fields.
 2014-10-09 00:14:25 +00:00
Geoff Mendal
db5b94d405 am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'f121892bc8c73b06086f8ebc059dd86f680b5197':
  Import translations. DO NOT MERGE
 2014-10-09 00:13:25 +00:00
Elliott Hughes
d47acaeecd Track change to private libcore data structure. 
Bug: 15476051
Change-Id: I4e28ecfa3a1d03c21f9bbde7f3daf79a79d96fe6
 2014-10-08 16:07:33 -07:00
Alan Viverette
f92f26fef2 Slow down ripple background fade in from press 
BUG: 17433613
Change-Id: Ie9c4046532d61ad8ef8e044d14557db5d52e0d0b
 2014-10-08 14:49:21 -07:00