OSDN Git Service
Jason Monk [Fri, 12 Dec 2014 18:49:26 +0000 (18:49 +0000)]
am
10680627: am
a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
* commit '
106806270c6808c94978ce39e11b7ea73a2cfcf1':
Fix tests after inet changes in NetworkController
Jason Monk [Fri, 12 Dec 2014 18:43:28 +0000 (18:43 +0000)]
am
a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
* commit '
a68697005137c2b5c5feb43b8cac078f7b75ec18':
Fix tests after inet changes in NetworkController
Jason Monk [Fri, 12 Dec 2014 18:36:24 +0000 (18:36 +0000)]
Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
John Reck [Fri, 12 Dec 2014 17:55:45 +0000 (17:55 +0000)]
Merge "Fix style" into lmp-mr1-dev-plus-aosp
John Reck [Fri, 12 Dec 2014 17:49:29 +0000 (09:49 -0800)]
Fix style
Change-Id: I7227b0eac126bf470ed50249a7809b845872983b
Esteban Talavera [Fri, 12 Dec 2014 17:17:32 +0000 (17:17 +0000)]
am
4f40fb47: Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev automerge:
c28fa2c
* commit '
4f40fb471265a164a0bdfd060d90375ce706b1dd':
Take into account other profiles when deciding whether to show ResolverActivity
Esteban Talavera [Fri, 12 Dec 2014 17:08:46 +0000 (17:08 +0000)]
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
automerge:
c28fa2c
* commit '
c28fa2cdd4692faafc520972b71ddbac1feec4d3':
Take into account other profiles when deciding whether to show ResolverActivity
Esteban Talavera [Fri, 12 Dec 2014 16:59:28 +0000 (16:59 +0000)]
Merge "Take into account other profiles when deciding whether to show ResolverActivity" into lmp-mr1-dev
Jorim Jaggi [Fri, 12 Dec 2014 15:46:37 +0000 (15:46 +0000)]
am
e741a3e9: am
8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev
* commit '
e741a3e9fe1d710f5531d134ae317d2b73c57292':
Limit item count in QS detail
Jorim Jaggi [Fri, 12 Dec 2014 15:46:30 +0000 (15:46 +0000)]
am
19131b49: am
d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
* commit '
19131b49f62e6a6b21013be1f9f25b3874728a9b':
Fix low FPS when entering wifi/BT detail panel
Jorim Jaggi [Fri, 12 Dec 2014 15:46:24 +0000 (15:46 +0000)]
am
569a113a: am
ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
* commit '
569a113a1957fee2a9ef2131f3334e68b30f30f4':
Improve transition when going to Wifi/BT detail panel
Jorim Jaggi [Fri, 12 Dec 2014 15:39:27 +0000 (15:39 +0000)]
am
8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev
* commit '
8934e67051a7c2598ad94699037701c4c6bf83ca':
Limit item count in QS detail
Jorim Jaggi [Fri, 12 Dec 2014 15:39:22 +0000 (15:39 +0000)]
am
d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
* commit '
d3cccec08361effa5d0f47143ea8c521f49bad79':
Fix low FPS when entering wifi/BT detail panel
Jorim Jaggi [Fri, 12 Dec 2014 15:39:16 +0000 (15:39 +0000)]
am
ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
* commit '
ab60f2855b0d2a96fe1610f42a83dc761c4c10e6':
Improve transition when going to Wifi/BT detail panel
Jorim Jaggi [Fri, 12 Dec 2014 15:32:55 +0000 (15:32 +0000)]
Merge "Limit item count in QS detail" into lmp-mr1-dev
Jorim Jaggi [Fri, 12 Dec 2014 15:32:28 +0000 (15:32 +0000)]
Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
Jorim Jaggi [Fri, 12 Dec 2014 15:32:16 +0000 (15:32 +0000)]
Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
Jason Monk [Fri, 12 Dec 2014 15:23:12 +0000 (10:23 -0500)]
Fix tests after inet changes in NetworkController
Bug:
17460017
Change-Id: Iee9c4399f5ca4413f1449cfcf05d72a67b0adadc
John Reck [Fri, 12 Dec 2014 15:22:19 +0000 (07:22 -0800)]
Fix build breakage
Change-Id: Ib3904c4be5b7df0f6d02f92d63f056968243621d
Esteban Talavera [Thu, 11 Dec 2014 17:54:07 +0000 (17:54 +0000)]
Take into account other profiles when deciding whether to show ResolverActivity
Show ResolverActivity even if there is only one target
on the current profile that listens to that intent,
if other profiles can also handle it.
Also, fix crash while trying to access out of bounds
element on the list.
BUG:
18701336,
18713763
Change-Id: I3a5e9cc5c0eedb2792b8f6d8a5d4aa8ee9e1256b
Olawale Ogunwale [Fri, 12 Dec 2014 14:04:24 +0000 (14:04 +0000)]
am
0e954dcc: am
bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
* commit '
0e954dccabc4b3d7247c6469864bf20d059e02b9':
[ActivityManager] Fix NPE when start activity
Olawale Ogunwale [Fri, 12 Dec 2014 13:57:06 +0000 (13:57 +0000)]
am
bfb30244: Merge "[ActivityManager] Fix NPE when start activity"
* commit '
bfb30244fbd3c6ba9eb8308b6bbacc9f78e8b6ef':
[ActivityManager] Fix NPE when start activity
Christopher Tate [Fri, 12 Dec 2014 13:54:33 +0000 (13:54 +0000)]
am
eb9d4fdf: am
a91ef1ec: Properly recognize repeating wakeup alarms automerge:
8965a8d
automerge:
0703c09
* commit '
0703c09b9a0568b4c96316c206f9a5e8675cd951':
Properly recognize repeating wakeup alarms
Olawale Ogunwale [Fri, 12 Dec 2014 13:49:50 +0000 (13:49 +0000)]
Merge "[ActivityManager] Fix NPE when start activity"
Christopher Tate [Fri, 12 Dec 2014 13:33:53 +0000 (13:33 +0000)]
am
eb9d4fdf: am
a91ef1ec: Properly recognize repeating wakeup alarms automerge:
8965a8d
* commit '
eb9d4fdf4623fe23f0f224b5ae2d68cd4c714c7f':
Properly recognize repeating wakeup alarms
Christopher Tate [Fri, 12 Dec 2014 13:24:06 +0000 (13:24 +0000)]
am
a91ef1ec: Properly recognize repeating wakeup alarms automerge:
8965a8d
* commit '
a91ef1ec04affdf98eb89f11b67fdbae72acb8dd':
Properly recognize repeating wakeup alarms
Christopher Tate [Fri, 12 Dec 2014 13:14:30 +0000 (13:14 +0000)]
Properly recognize repeating wakeup alarms
automerge:
8965a8d
* commit '
8965a8da5513cf31a313ecdac3506718c2813932':
Properly recognize repeating wakeup alarms
Wink Saville [Fri, 12 Dec 2014 04:42:38 +0000 (04:42 +0000)]
am
6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
automerge:
6cc44cc
* commit '
6cc44cce0e375b165580a8061359b2ff163a4556':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Wink Saville [Fri, 12 Dec 2014 04:37:40 +0000 (04:37 +0000)]
am
6e04a7b6: Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
* commit '
6e04a7b65488656c4cb72d99d285050d56068112':
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Iliyan Malchev [Fri, 12 Dec 2014 04:30:52 +0000 (04:30 +0000)]
am
45838de9: fix Uss accounting in getPssPid()
automerge:
72468d2
* commit '
72468d2d146f737b2b5d0223687b8fbc52723c76':
fix Uss accounting in getPssPid()
Jim Miller [Fri, 12 Dec 2014 04:29:11 +0000 (04:29 +0000)]
am
4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev
automerge:
0ca6b7f
* commit '
0ca6b7f98085c079ccfb4b799fba5f570380a827':
Attempt to fix keyguard missing bug
John Reck [Fri, 12 Dec 2014 04:27:14 +0000 (04:27 +0000)]
am
b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev
automerge:
b21a7ad
* commit '
b21a7ad02e43900ea5480e796cb1518bd5829e3f':
Force-flush state sync on texid change
Chris Craik [Fri, 12 Dec 2014 04:25:43 +0000 (04:25 +0000)]
am
63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev
automerge:
00905a9
* commit '
00905a984c07ffc9960ce83548631c59aae37ec6':
Correct layer size formatting in trace
Craig Mautner [Fri, 12 Dec 2014 04:24:34 +0000 (04:24 +0000)]
am
72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev
automerge:
922f8e2
* commit '
922f8e2c0f58e57d02ab136f24f135553e6d9720':
Don't apply animations to windows that are showing
David Friedman [Fri, 12 Dec 2014 04:23:07 +0000 (04:23 +0000)]
am
e84bf9fd: am
d0d76540: am
c82392df: am
1ab615b3: Merge "Adds link to related video." into lmp-docs
automerge:
e90a170
* commit '
e90a170f67f91d9b0166ac4f0de07f63207b1bce':
Adds link to related video.
Wink Saville [Fri, 12 Dec 2014 04:22:38 +0000 (04:22 +0000)]
Merge "Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId." into lmp-mr1-dev
Alan Viverette [Fri, 12 Dec 2014 04:21:42 +0000 (04:21 +0000)]
am
ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
automerge:
4b7f724
* commit '
4b7f724fb23166f892781ae7daa2df76bede2134':
Improve time picker accessibility
Winson Chung [Fri, 12 Dec 2014 04:20:19 +0000 (04:20 +0000)]
am
47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug
18718114)" into lmp-mr1-dev
automerge:
8c8c99c
* commit '
8c8c99cf0873e10f19d79bfe79d8ea56848dadb4':
Fixing issue with old thumbnails on first launch of app. (Bug
18718114)
Joe Fernandez [Fri, 12 Dec 2014 04:19:03 +0000 (04:19 +0000)]
am
81779694: am
c9014b6d: am
ea500a3a: am
0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
automerge:
a878256
* commit '
a878256b59e1766ce918257dbfe343b0d3d0ec2d':
docs: studio basics haxm updates
Ricardo Cervera [Fri, 12 Dec 2014 04:17:41 +0000 (04:17 +0000)]
am
af7070e6: am
64d97cb2: am
6621a4f6: am
9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
automerge:
575c8c9
* commit '
575c8c9fcdc2ee8ed614ac9b6a4992fffe8ccea4':
docs: Fixes to watch faces docs.
Rich Slogar [Fri, 12 Dec 2014 04:16:30 +0000 (04:16 +0000)]
am
0564cee3: am
b490f297: am
5c853c26: am
d35216ad: Merge "docs: studio bundle update" into lmp-docs
automerge:
51f1c26
* commit '
51f1c26b5b4b2c514fd5a4ca11de98542ccd4166':
docs: studio bundle update
Joe Fernandez [Fri, 12 Dec 2014 04:14:43 +0000 (04:14 +0000)]
am
07877955: am
5c518b7f: am
b32987ec: am
c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
automerge:
cc08e61
* commit '
cc08e619d6a946b58b2aae857e3190b5996c07b8':
docs: platform updates for api 21
Joe Fernandez [Fri, 12 Dec 2014 04:13:20 +0000 (04:13 +0000)]
am
e3bac3bc: am
b64545c8: am
378c71a3: am
235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
automerge:
11bccb1
* commit '
11bccb1ebe457bc3cca582320d13a459920425d9':
docs: sdk tools 24.0.1 revisions
Andrew Solovay [Fri, 12 Dec 2014 04:11:53 +0000 (04:11 +0000)]
am
13e0a650: am
a97053fd: am
f43c057c: am
c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
automerge:
fe96791
* commit '
fe967912faf8ddf79d9eab794c4a2417758b716d':
docs: Added info about managed profiles to "Android 5.0 Changes"
Ruben Brunk [Fri, 12 Dec 2014 04:09:55 +0000 (04:09 +0000)]
am
f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
automerge:
81b381b
* commit '
81b381b82e83ec742a8a6541dabbc63dae087c0a':
camera2: Fix LEGACY YUV production and orientation.
Jason Monk [Fri, 12 Dec 2014 04:08:33 +0000 (04:08 +0000)]
am
7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev
automerge:
70cf2f7
* commit '
70cf2f72f2e19570d81c1365164313437b38ffd5':
Fix crash in BluetoothControllerImpl
Amit Mahajan [Fri, 12 Dec 2014 04:05:59 +0000 (04:05 +0000)]
am
c5da1d3d: Merge "Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network." into lmp-mr1-dev
automerge:
cac8662
* commit '
cac8662943b28663fefc6e5315a7b9acd514bfdb':
Adding new config variable that is used to determine if ERI should be used when voice RAT is LTE on CDMA network.
John Spurlock [Fri, 12 Dec 2014 04:04:40 +0000 (04:04 +0000)]
am
0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev
automerge:
6f9a717
* commit '
6f9a71729f6ba7521ed8461ec8b556a8907743b1':
Zen: Leave zen=none on manual ringer mode stream volume changes.
Iliyan Malchev [Fri, 12 Dec 2014 00:34:35 +0000 (00:34 +0000)]
am
45838de9: fix Uss accounting in getPssPid()
* commit '
45838de942b87150fc3b03a8b943841a8647fd81':
fix Uss accounting in getPssPid()
Iliyan Malchev [Thu, 11 Dec 2014 22:29:36 +0000 (14:29 -0800)]
fix Uss accounting in getPssPid()
Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Jim Miller [Thu, 11 Dec 2014 23:41:03 +0000 (23:41 +0000)]
am
4841a787: Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev
* commit '
4841a787b3380ba045a465e347668729b19f3d79':
Attempt to fix keyguard missing bug
Jim Miller [Thu, 11 Dec 2014 23:33:09 +0000 (23:33 +0000)]
Merge "Attempt to fix keyguard missing bug" into lmp-mr1-dev
Christopher Tate [Tue, 2 Dec 2014 19:48:53 +0000 (11:48 -0800)]
Properly recognize repeating wakeup alarms
cherry-pick from lmp-mr1-dev
The code in place was inappropriately treating all recurring alarms
as non-wakeup for purposes of deferral. Worse, it was overriding the
"this deliverable batch of alarms includes a wakeup alarm" bookkeeping,
so could potentially cause inappropriate deferral of even standalone
wakeup alarms.
Bug
18591317
Change-Id: I2a62ed4badcaeb549c1ac4f086014aa829e45427
(cherry picked from commit
864d42eb96a9127b7d2f10ad11e709c24b4b4304)
John Reck [Thu, 11 Dec 2014 22:49:52 +0000 (22:49 +0000)]
am
b9a4d15d: Merge "Force-flush state sync on texid change" into lmp-mr1-dev
* commit '
b9a4d15d0942a55c7dc32a471ee40890986e3fab':
Force-flush state sync on texid change
Chris Craik [Thu, 11 Dec 2014 22:49:46 +0000 (22:49 +0000)]
am
63c7b246: Merge "Correct layer size formatting in trace" into lmp-mr1-dev
* commit '
63c7b24645d94c92dc6dc32d57c23b5167950c8b':
Correct layer size formatting in trace
John Reck [Thu, 11 Dec 2014 22:44:18 +0000 (22:44 +0000)]
Merge "Force-flush state sync on texid change" into lmp-mr1-dev
Chris Craik [Thu, 11 Dec 2014 22:43:16 +0000 (22:43 +0000)]
Merge "Correct layer size formatting in trace" into lmp-mr1-dev
Craig Mautner [Thu, 11 Dec 2014 22:29:58 +0000 (22:29 +0000)]
am
72b047c6: Merge "Don\'t apply animations to windows that are showing" into lmp-mr1-dev
* commit '
72b047c6c37ddf860be15b159b9a143be36d7425':
Don't apply animations to windows that are showing
David Friedman [Thu, 11 Dec 2014 22:29:53 +0000 (22:29 +0000)]
am
e84bf9fd: am
d0d76540: am
c82392df: am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
e84bf9fddce69f2cc6b9e5f4274419a4122476a2':
Adds link to related video.
Chris Craik [Thu, 11 Dec 2014 22:29:51 +0000 (14:29 -0800)]
Correct layer size formatting in trace
bug:
18722704
Change-Id: Icef9aaa62633b2d86ad250f43d4c8fa5cc0b6842
Craig Mautner [Thu, 11 Dec 2014 22:27:52 +0000 (22:27 +0000)]
Merge "Don't apply animations to windows that are showing" into lmp-mr1-dev
John Reck [Thu, 11 Dec 2014 22:27:39 +0000 (14:27 -0800)]
Force-flush state sync on texid change
Bug:
18718646
Caused because the Texture object thought the GLES texture
was in a different state than it was as it persists across
EGL/GL contexts. Fix this by force-flushing the default
values when the texid has changed.
Change-Id: I264bac9a2beb08df8e2ba8a85ad15f0dd1fce22a
David Friedman [Thu, 11 Dec 2014 22:21:16 +0000 (22:21 +0000)]
am
d0d76540: am
c82392df: am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
d0d76540ae937d6773793ba053e81ee3667d0ba6':
Adds link to related video.
Alan Viverette [Thu, 11 Dec 2014 22:19:07 +0000 (22:19 +0000)]
am
ff441883: Merge "Improve time picker accessibility" into lmp-mr1-dev
* commit '
ff44188309fca037892d0ded64cfee04a3a71c42':
Improve time picker accessibility
Alan Viverette [Thu, 11 Dec 2014 22:11:54 +0000 (22:11 +0000)]
Merge "Improve time picker accessibility" into lmp-mr1-dev
David Friedman [Thu, 11 Dec 2014 22:10:48 +0000 (22:10 +0000)]
am
c82392df: am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
c82392df7caa12836d97650c7528f216d3c2b76f':
Adds link to related video.
David Friedman [Thu, 11 Dec 2014 22:03:42 +0000 (22:03 +0000)]
am
1ab615b3: Merge "Adds link to related video." into lmp-docs
* commit '
1ab615b3e6a7ae820fde4ba067f76dff635f3639':
Adds link to related video.
David Friedman [Thu, 11 Dec 2014 21:55:23 +0000 (21:55 +0000)]
Merge "Adds link to related video." into lmp-docs
Wink Saville [Thu, 11 Dec 2014 21:37:50 +0000 (13:37 -0800)]
Change tests against INVALID_SUBSCRIPTION_ID to use isValidSubscriptionId.
Rename isValidSubId to isValidSubscriptionId.
Bug:
18668873
Change-Id: Ie709a62bbb74e0a767daeb9e3fb3aecd4c45df44
Winson Chung [Thu, 11 Dec 2014 21:27:54 +0000 (21:27 +0000)]
am
47d9a58c: Merge "Fixing issue with old thumbnails on first launch of app. (Bug
18718114)" into lmp-mr1-dev
* commit '
47d9a58ce15007f79bc094d9b1599e41d51670a3':
Fixing issue with old thumbnails on first launch of app. (Bug
18718114)
Winson Chung [Thu, 11 Dec 2014 21:20:40 +0000 (21:20 +0000)]
Merge "Fixing issue with old thumbnails on first launch of app. (Bug
18718114)" into lmp-mr1-dev
Joe Fernandez [Thu, 11 Dec 2014 21:03:11 +0000 (21:03 +0000)]
am
81779694: am
c9014b6d: am
ea500a3a: am
0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit '
817796940bf79942ccd950cec47815039a2aa15e':
docs: studio basics haxm updates
Ricardo Cervera [Thu, 11 Dec 2014 21:03:06 +0000 (21:03 +0000)]
am
af7070e6: am
64d97cb2: am
6621a4f6: am
9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '
af7070e6f0bb2b035b1d2565fdd50b6bde210864':
docs: Fixes to watch faces docs.
Rich Slogar [Thu, 11 Dec 2014 21:02:44 +0000 (21:02 +0000)]
am
0564cee3: am
b490f297: am
5c853c26: am
d35216ad: Merge "docs: studio bundle update" into lmp-docs
* commit '
0564cee3c7537c916c74e560e2160b0f0657a9eb':
docs: studio bundle update
Joe Fernandez [Thu, 11 Dec 2014 21:02:37 +0000 (21:02 +0000)]
am
07877955: am
5c518b7f: am
b32987ec: am
c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit '
07877955bef2132ea5e8d02662a7f0ca1aad5f7d':
docs: platform updates for api 21
Joe Fernandez [Thu, 11 Dec 2014 21:02:32 +0000 (21:02 +0000)]
am
e3bac3bc: am
b64545c8: am
378c71a3: am
235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit '
e3bac3bc8f015a1ee8238fef7ca155fb432beb51':
docs: sdk tools 24.0.1 revisions
Andrew Solovay [Thu, 11 Dec 2014 21:02:26 +0000 (21:02 +0000)]
am
13e0a650: am
a97053fd: am
f43c057c: am
c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit '
13e0a6505fd049a8df47aa8fa01b7c8c3120dea1':
docs: Added info about managed profiles to "Android 5.0 Changes"
Chih-hung Hsieh [Thu, 11 Dec 2014 21:02:08 +0000 (21:02 +0000)]
am
b0dd6d3a: am
4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
* commit '
b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
Adjust format strings to work on both 32-bit and 64-bit builds
Joe Fernandez [Thu, 11 Dec 2014 20:55:53 +0000 (20:55 +0000)]
am
c9014b6d: am
ea500a3a: am
0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit '
c9014b6d59cae3602027a5ea373d436a7e78b71c':
docs: studio basics haxm updates
Ricardo Cervera [Thu, 11 Dec 2014 20:55:49 +0000 (20:55 +0000)]
am
64d97cb2: am
6621a4f6: am
9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '
64d97cb2ad6bfd10511067f178ba8a1ccf9ba452':
docs: Fixes to watch faces docs.
Rich Slogar [Thu, 11 Dec 2014 20:55:45 +0000 (20:55 +0000)]
am
b490f297: am
5c853c26: am
d35216ad: Merge "docs: studio bundle update" into lmp-docs
* commit '
b490f297101bcf31f56278d21d5f56a5e5998a58':
docs: studio bundle update
Joe Fernandez [Thu, 11 Dec 2014 20:55:35 +0000 (20:55 +0000)]
am
5c518b7f: am
b32987ec: am
c3daed96: Merge "docs: platform updates for api 21" into lmp-docs
* commit '
5c518b7f01345a414cd260db7762bdb0aa73b55b':
docs: platform updates for api 21
Joe Fernandez [Thu, 11 Dec 2014 20:55:29 +0000 (20:55 +0000)]
am
b64545c8: am
378c71a3: am
235e4be4: Merge "docs: sdk tools 24.0.1 revisions" into lmp-docs
* commit '
b64545c83a526d17ccbce2d110a06f3789dd4ad8':
docs: sdk tools 24.0.1 revisions
Andrew Solovay [Thu, 11 Dec 2014 20:55:23 +0000 (20:55 +0000)]
am
a97053fd: am
f43c057c: am
c7ad6e91: docs: Added info about managed profiles to "Android 5.0 Changes"
* commit '
a97053fd0ba37feb7382fd30498a6a5e93c52a9e':
docs: Added info about managed profiles to "Android 5.0 Changes"
Chih-hung Hsieh [Thu, 11 Dec 2014 20:54:56 +0000 (20:54 +0000)]
am
4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
* commit '
4c23a0ec161891a1248b7aea67fbfd1d00bbd199':
Adjust format strings to work on both 32-bit and 64-bit builds
Jorim Jaggi [Thu, 11 Dec 2014 20:00:12 +0000 (21:00 +0100)]
Limit item count in QS detail
- Introduce a maximum number of items to be shown in QS detail view
depending on the device configuration.
- For Wifi and Cast, make the panel exactly that height as we would
show the maximum count of items, in order to prevent that the
buttons jump around.
Bug:
18665311
Change-Id: I7c0c383a902d295f1b486b8a074e15b990fbe562
Chih-hung Hsieh [Thu, 11 Dec 2014 20:49:29 +0000 (20:49 +0000)]
Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
Winson Chung [Thu, 11 Dec 2014 19:04:19 +0000 (11:04 -0800)]
Fixing issue with old thumbnails on first launch of app. (Bug
18718114)
Ensure that we always update the thumbnail for the running task, in addition, we
need to be ignoring the running task when doing background preloading since it
will be invalidated anyways.
Change-Id: Ie4f9862dddc29aa71a44e94bbd036c7712487eed
Joe Fernandez [Thu, 11 Dec 2014 19:59:00 +0000 (19:59 +0000)]
am
ea500a3a: am
0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit '
ea500a3adf6bcf17ad22f05acd8c3220358f72ce':
docs: studio basics haxm updates
Ruben Brunk [Thu, 11 Dec 2014 19:55:02 +0000 (19:55 +0000)]
am
f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
* commit '
f6ed526b3a02bac9c5912a9655e5890f332cefc6':
camera2: Fix LEGACY YUV production and orientation.
Joe Fernandez [Thu, 11 Dec 2014 19:50:39 +0000 (19:50 +0000)]
am
0aa23445: Merge "docs: studio basics haxm updates" into lmp-docs
* commit '
0aa234457737cdb31538711251920aef3a70bb56':
docs: studio basics haxm updates
Ruben Brunk [Thu, 11 Dec 2014 19:48:36 +0000 (19:48 +0000)]
Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev
Ricardo Cervera [Thu, 11 Dec 2014 19:43:25 +0000 (19:43 +0000)]
am
6621a4f6: am
9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '
6621a4f6f9c63ff952c5e64a5ae1e41ef5ac5960':
docs: Fixes to watch faces docs.
Joe Fernandez [Thu, 11 Dec 2014 19:43:17 +0000 (19:43 +0000)]
Merge "docs: studio basics haxm updates" into lmp-docs
Ruben Brunk [Thu, 11 Dec 2014 03:12:41 +0000 (19:12 -0800)]
camera2: Fix LEGACY YUV production and orientation.
Bug:
18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
Ricardo Cervera [Thu, 11 Dec 2014 19:35:41 +0000 (19:35 +0000)]
am
9fe34d90: Merge "docs: Fixes to watch faces docs." into lmp-docs
* commit '
9fe34d9037dc27abb89c64ff75b87fdf9a4eaa8b':
docs: Fixes to watch faces docs.
Ricardo Cervera [Thu, 11 Dec 2014 19:28:39 +0000 (19:28 +0000)]
Merge "docs: Fixes to watch faces docs." into lmp-docs
Jason Monk [Thu, 11 Dec 2014 19:28:28 +0000 (19:28 +0000)]
am
7d8ccb41: Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev
* commit '
7d8ccb41fa3756839597cd28cd5710c1b690e17f':
Fix crash in BluetoothControllerImpl
Craig Mautner [Thu, 11 Dec 2014 19:24:32 +0000 (11:24 -0800)]
Don't apply animations to windows that are showing
If a window is showing and not obscured by the keyguard, for
example windows on other displays, don't apply the enter animation.
This prevents jank on secondary displays when the keyguard is
unlocked.
Fixes bug
18689396
Change-Id: I2deb3030e6e887f57af9a5f1d42b1c71f06f7eeb
Jason Monk [Thu, 11 Dec 2014 19:22:17 +0000 (19:22 +0000)]
Merge "Fix crash in BluetoothControllerImpl" into lmp-mr1-dev
OSDN Git Service
