Commit Graph

236496 Commits

Author SHA1 Message Date
Jason Monk
ec73bb0be2 Merge changes I70299512,I42df29b4 into nyc-dev am: c519288b8d
am: 6f6da41798

* commit '6f6da41798fa0c0f6eb66d2b32800b1690ef6619':
  Add tests for TouchAnimator
  Fix TouchAnimator callbacks
2016-02-29 18:20:21 +00:00
Jason Monk
6f6da41798 Merge changes I70299512,I42df29b4 into nyc-dev
am: c519288b8d

* commit 'c519288b8d227f285ff242fa5995b078e72e7897':
  Add tests for TouchAnimator
  Fix TouchAnimator callbacks
2016-02-29 18:18:50 +00:00
Jason Monk
c519288b8d Merge changes I70299512,I42df29b4 into nyc-dev
* changes:
  Add tests for TouchAnimator
  Fix TouchAnimator callbacks
2016-02-29 18:16:39 +00:00
Omkar Kolangade
43b3c17b01 Merge "IMS Connection Capabilities Update" into mm-wireless-dev am: 4aeafd8f27 am: a0a8f75699
am: d9764aa836

* commit 'd9764aa836e425f26d0657528a4333c065f46be1':
  IMS Connection Capabilities Update
2016-02-29 18:14:53 +00:00
Omkar Kolangade
d9764aa836 Merge "IMS Connection Capabilities Update" into mm-wireless-dev am: 4aeafd8f27
am: a0a8f75699

* commit 'a0a8f75699636485d80497e5e6734233fef776f9':
  IMS Connection Capabilities Update
2016-02-29 18:12:55 +00:00
Omkar Kolangade
a0a8f75699 Merge "IMS Connection Capabilities Update" into mm-wireless-dev
am: 4aeafd8f27

* commit '4aeafd8f27852bdb684711f1df807ff0e59cb354':
  IMS Connection Capabilities Update
2016-02-29 18:10:06 +00:00
Tyler Gunn
4aeafd8f27 Merge "IMS Connection Capabilities Update" into mm-wireless-dev 2016-02-29 18:06:25 +00:00
Jason Monk
f6a3cf9291 Add tests for TouchAnimator
Also fix existing tests

Bug: 27392084
Change-Id: I70299512e8fa3e0cb86c868b47df7703e04d6084
2016-02-29 13:01:08 -05:00
Jason Monk
df5459daaa Fix TouchAnimator callbacks
Bug: 27392084
Change-Id: I42df29b4c7df4f709dd2fafa90037d485e93f3bd
2016-02-29 12:59:38 -05:00
Geoff Mendal
3e672ae77a Merge "Import translations. DO NOT MERGE" into nyc-dev am: 342006e919 -s ours
am: c6e2ebb642  -s ours

* commit 'c6e2ebb642ca5a877964dcfffa502723ff9c7e45':
  Import translations. DO NOT MERGE
2016-02-29 15:41:09 +00:00
Geoff Mendal
c6e2ebb642 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 342006e919  -s ours

* commit '342006e91990f59b2e71c76a7d8589f7de571246':
  Import translations. DO NOT MERGE
2016-02-29 15:37:06 +00:00
Ben Kwa
b6cd661e24 Merge "Clean up drag-n-drop." into nyc-dev am: bfbf22b029
am: 12886be27d

* commit '12886be27d61c4f699d2cf1f39932e3871e0e153':
  Clean up drag-n-drop.
2016-02-29 15:36:37 +00:00
Geoff Mendal
342006e919 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-29 15:34:26 +00:00
Geoff Mendal
1211d70d0b Import translations. DO NOT MERGE
Change-Id: I1ce2ed342ab6e3155ff634c5e713fc3d6bfef540
Auto-generated-cl: translation import
2016-02-29 07:32:23 -08:00
Ben Kwa
12886be27d Merge "Clean up drag-n-drop." into nyc-dev
am: bfbf22b029

* commit 'bfbf22b029f23972799a9ba6cc3869aac1c4f5b5':
  Clean up drag-n-drop.
2016-02-29 15:31:24 +00:00
Geoff Mendal
b590fbff04 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0cf7ca8edc -s ours
am: aeb18a0743  -s ours

* commit 'aeb18a074303222596892e1a562a51630f3983ea':
  Import translations. DO NOT MERGE
2016-02-29 15:31:17 +00:00
Geoff Mendal
aeb18a0743 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 0cf7ca8edc  -s ours

* commit '0cf7ca8edc1f4a8bbf956efa51862ed00fc69ff2':
  Import translations. DO NOT MERGE
2016-02-29 15:29:40 +00:00
Ben Kwa
bfbf22b029 Merge "Clean up drag-n-drop." into nyc-dev 2016-02-29 15:27:29 +00:00
Geoff Mendal
0cf7ca8edc Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-29 15:26:48 +00:00
Geoff Mendal
a5f87c4977 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 8874c1dcc9 -s ours
am: 79fd5e9a7d  -s ours

* commit '79fd5e9a7d296e939c4028150b85b58e5eaa4b6f':
  Import translations. DO NOT MERGE
2016-02-29 15:26:11 +00:00
Geoff Mendal
4cea6997ba Import translations. DO NOT MERGE
Change-Id: I8097eb86b2a7a2f60f182fdafbc4d942b9ed17f6
Auto-generated-cl: translation import
2016-02-29 07:25:23 -08:00
Jorim Jaggi
15f7b6f8e5 Force carrier network change anim onto UI thread am: 035a82d264
am: ef5fac68df

* commit 'ef5fac68df8c1518b294dcb4fbeef54104b75018':
  Force carrier network change anim onto UI thread
2016-02-29 15:22:06 +00:00
Geoff Mendal
79fd5e9a7d Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 8874c1dcc9  -s ours

* commit '8874c1dcc94e0893ac32235b3a0b120abbe43750':
  Import translations. DO NOT MERGE
2016-02-29 15:20:51 +00:00
Jorim Jaggi
ef5fac68df Force carrier network change anim onto UI thread
am: 035a82d264

* commit '035a82d264b8c4cdcb88cb542019a48b7629c973':
  Force carrier network change anim onto UI thread
2016-02-29 15:18:59 +00:00
Geoff Mendal
8874c1dcc9 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-29 15:17:12 +00:00
Geoff Mendal
c78750a61b Import translations. DO NOT MERGE
Change-Id: Ibf90518a4ea01d2cfc6bb3d43867ae2b499dfea8
Auto-generated-cl: translation import
2016-02-29 07:16:29 -08:00
Jorim Jaggi
035a82d264 Force carrier network change anim onto UI thread
Fixes a bug where RenderThread was constantly scheduling frames,
but didn't actually start the animation. Also fixes some jank
while the animation is playing.

Bug: 27396097
Change-Id: I353d60633eeef1a4f3bbfbeddb58f9703debe293
2016-02-29 15:16:21 +00:00
Geoff Mendal
4c9b0d8d0f Merge "Import translations. DO NOT MERGE" 2016-02-29 14:07:25 +00:00
Geoff Mendal
df7292f19e Import translations. DO NOT MERGE
Change-Id: I1b53eaeda0b4b3e080646857d379b6b93c64da6c
Auto-generated-cl: translation import
2016-02-29 06:06:30 -08:00
Geoff Mendal
78b8c2acdb Merge "Import translations. DO NOT MERGE" 2016-02-29 14:01:27 +00:00
Geoff Mendal
8713eeb640 Import translations. DO NOT MERGE
Change-Id: Ifd0d5ab0a18df2527d5b6e770274c6cf6689ff60
Auto-generated-cl: translation import
2016-02-29 06:00:01 -08:00
Geoff Mendal
36aefca5cc Import translations. DO NOT MERGE am: 3f3d42e0d4 -s ours
am: 797c1b43ab  -s ours

* commit '797c1b43ab3f72d16e866f4eb09dcef893ffe46b':
  Import translations. DO NOT MERGE
2016-02-29 13:40:13 +00:00
Geoff Mendal
797c1b43ab Import translations. DO NOT MERGE
am: 3f3d42e0d4  -s ours

* commit '3f3d42e0d40c423bf932d16bb10892d16d35c641':
  Import translations. DO NOT MERGE
2016-02-29 13:38:06 +00:00
Geoff Mendal
3f3d42e0d4 Import translations. DO NOT MERGE
Change-Id: I1cce7667ddb8d95b4ee956c25afe76226bfdf613
Auto-generated-cl: translation import
2016-02-29 08:29:18 -05:00
Geoff Mendal
427caa9c0f Import translations. DO NOT MERGE
Change-Id: I8e7524ba933eb347f5be8fdb1a3ceedcd84b8ba7
Auto-generated-cl: translation import
2016-02-29 05:21:23 -08:00
Deepanshu Gupta
a766a6d354 Merge changes from topic \'java_8_layoutlib\' am: 5d5fd21e0a am: 00b594e5bc
am: d891215b94

* commit 'd891215b94cf325f04ce952b7f9269c4e4736a04':
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
2016-02-29 10:42:25 +00:00
Deepanshu Gupta
d891215b94 Merge changes from topic \'java_8_layoutlib\' am: 5d5fd21e0a
am: 00b594e5bc

* commit '00b594e5bca71d9069faf0a16736c183560c6042':
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
2016-02-29 10:40:19 +00:00
Deepanshu Gupta
00b594e5bc Merge changes from topic \'java_8_layoutlib\'
am: 5d5fd21e0a

* commit '5d5fd21e0aa23662d513825a5054b3b3970b3118':
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
2016-02-29 10:37:16 +00:00
Neil Fuller
5d5fd21e0a Merge changes from topic 'java_8_layoutlib'
* changes:
  Switch LayoutLib to Java 8
  Move LayoutLib to Java 8
2016-02-29 10:33:29 +00:00
Yujie Qin
4427b31183 Merge "Use new API from PIEX" into nyc-dev am: 42d8b7d7ab
am: 26d072a2a9

* commit '26d072a2a9b4e328a8d07d5ad1dcca020bd52e41':
  Use new API from PIEX
2016-02-29 08:26:41 +00:00
Yujie Qin
26d072a2a9 Merge "Use new API from PIEX" into nyc-dev
am: 42d8b7d7ab

* commit '42d8b7d7abe4ecab049e020c3836dae97660dd4d':
  Use new API from PIEX
2016-02-29 08:24:48 +00:00
Yujie Qin
42d8b7d7ab Merge "Use new API from PIEX" into nyc-dev 2016-02-29 08:21:52 +00:00
Sungsoo Lim
fc9a809c69 Merge "MediaBrowser: Fix Javadoc" into nyc-dev am: 18eda4a1ca
am: 1518146ef1

* commit '1518146ef15212a99abf60323a17f53d0c2c01c8':
  MediaBrowser: Fix Javadoc
2016-02-29 05:25:27 +00:00
Sungsoo Lim
1518146ef1 Merge "MediaBrowser: Fix Javadoc" into nyc-dev
am: 18eda4a1ca

* commit '18eda4a1caba579962c54c6a8ca8ba08e2430c40':
  MediaBrowser: Fix Javadoc
2016-02-29 05:22:40 +00:00
Sungsoo Lim
18eda4a1ca Merge "MediaBrowser: Fix Javadoc" into nyc-dev 2016-02-29 05:19:53 +00:00
Sungsoo Lim
ab19dc8e14 MediaBrowser: Fix Javadoc
Bug: 27384292
Change-Id: I57ddfaea0fe888665bc7ee88cd933a660c26f1a6
2016-02-29 14:03:48 +09:00
Daichi Hirono
55bbfa08e1 Merge "Set document flag by referring MTP supported operations." into nyc-dev am: 1e41dcd1d2
am: 68f39cdd6e

* commit '68f39cdd6e3855b13ace11c256ffdb1aaf249082':
  Set document flag by referring MTP supported operations.
2016-02-29 04:09:31 +00:00
Daichi Hirono
68f39cdd6e Merge "Set document flag by referring MTP supported operations." into nyc-dev
am: 1e41dcd1d2

* commit '1e41dcd1d269637968e80e51946c95e9bf0ded6d':
  Set document flag by referring MTP supported operations.
2016-02-29 04:06:47 +00:00
Daichi Hirono
1e41dcd1d2 Merge "Set document flag by referring MTP supported operations." into nyc-dev 2016-02-29 04:03:03 +00:00
Eino-Ville Talvala
acda72fbe6 Merge "Media.effect: Remove redundant package info" into nyc-dev am: 0d0625993a
am: 12d993893f

* commit '12d993893f5d629d99959bd488b949e880146a3f':
  Media.effect: Remove redundant package info
2016-02-28 05:22:40 +00:00