OSDN Git Service
Yin-Chia Yeh [Thu, 11 Jun 2015 21:11:43 +0000 (21:11 +0000)]
am
990c85d0: am
dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev
* commit '
990c85d0c242cb2c53f0e6e90e14479236ca995b':
Camera2: Legacy: handle FPS range properly
Chris Craik [Thu, 11 Jun 2015 21:11:39 +0000 (21:11 +0000)]
am
c4f8e6d5: am
1b83edc6: Merge "Workaround shader crash" into mnc-dev
* commit '
c4f8e6d5ed8394d818b99ae11a791719ad371647':
Workaround shader crash
Amit Mahajan [Thu, 11 Jun 2015 21:11:33 +0000 (21:11 +0000)]
am
486d4283: am
02184244: Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev
* commit '
486d4283b22f55d107480d740b72e570fffe5de2':
Change to add STK_PERMISSION for stk related commands.
Zheng Fu [Thu, 11 Jun 2015 21:11:25 +0000 (21:11 +0000)]
am
cc7d826c: am
dfd93c69: Merge "Revert contact metadata_sync constants." into mnc-dev
* commit '
cc7d826c91c6609029178e1fd8648107697e7b1e':
Revert contact metadata_sync constants.
Adam Lesinski [Thu, 11 Jun 2015 21:11:21 +0000 (21:11 +0000)]
am
6643da95: am
df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev
* commit '
6643da955796231da5193c50aafcc59ff8655f7f':
Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
Roozbeh Pournader [Thu, 11 Jun 2015 21:11:17 +0000 (21:11 +0000)]
am
45bf88e9: am
51dd6a16: Merge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc-dev
* commit '
45bf88e953025779eb3ebaa0eeed0ba608e731da':
Merge EXTENDED font profile with the next (unnamed) profile.
Jason Monk [Thu, 11 Jun 2015 21:11:00 +0000 (21:11 +0000)]
am
88bc1871: am
00a34ab5: Merge "Protect against null detail record." into mnc-dev
* commit '
88bc1871f4c11682af249398713dbb7558759f22':
Protect against null detail record.
Carlos Valdivia [Thu, 11 Jun 2015 21:10:55 +0000 (21:10 +0000)]
am
9c9ebccd: am
d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev
* commit '
9c9ebccd028fecafaf36660351ce598b7ff8106c':
Revert "Permissions: Fix account related permissions."
Jeff Sharkey [Thu, 11 Jun 2015 21:10:50 +0000 (21:10 +0000)]
am
a6f89a07: am
c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev
* commit '
a6f89a07f191c8f80d7cbce62b178f8bdc23ec18':
Ignore some more generic USB device names.
Yin-Chia Yeh [Thu, 11 Jun 2015 20:36:29 +0000 (20:36 +0000)]
am
dba1cf3d: Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev
* commit '
dba1cf3d515b382e997a5a0e50b50215e3f65f9e':
Camera2: Legacy: handle FPS range properly
Chris Craik [Thu, 11 Jun 2015 20:36:24 +0000 (20:36 +0000)]
am
1b83edc6: Merge "Workaround shader crash" into mnc-dev
* commit '
1b83edc6160d18323c7a0e0b892e97c05914ff81':
Workaround shader crash
Amit Mahajan [Thu, 11 Jun 2015 20:30:17 +0000 (20:30 +0000)]
am
02184244: Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev
* commit '
02184244dcd0149252676bbf24c6d9a5c9ebfd5b':
Change to add STK_PERMISSION for stk related commands.
Zheng Fu [Thu, 11 Jun 2015 20:30:13 +0000 (20:30 +0000)]
am
dfd93c69: Merge "Revert contact metadata_sync constants." into mnc-dev
* commit '
dfd93c69c08bf0bd0c7a631b27c50a51096c9727':
Revert contact metadata_sync constants.
Adam Lesinski [Thu, 11 Jun 2015 20:30:08 +0000 (20:30 +0000)]
am
df85c12b: Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev
* commit '
df85c12ba5eaa81a064eb8a837f3d2e8a110a3c8':
Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
Roozbeh Pournader [Thu, 11 Jun 2015 20:30:04 +0000 (20:30 +0000)]
am
51dd6a16: Merge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc-dev
* commit '
51dd6a16f7891c40b45dff66174a0374d54e680a':
Merge EXTENDED font profile with the next (unnamed) profile.
Yin-Chia Yeh [Thu, 11 Jun 2015 20:29:00 +0000 (20:29 +0000)]
Merge "Camera2: Legacy: handle FPS range properly" into mnc-dev
Chris Craik [Thu, 11 Jun 2015 20:28:39 +0000 (20:28 +0000)]
Merge "Workaround shader crash" into mnc-dev
Amit Mahajan [Thu, 11 Jun 2015 20:26:14 +0000 (20:26 +0000)]
Merge "Change to add STK_PERMISSION for stk related commands." into mnc-dev
Zheng Fu [Thu, 11 Jun 2015 20:24:58 +0000 (20:24 +0000)]
Merge "Revert contact metadata_sync constants." into mnc-dev
Adam Lesinski [Thu, 11 Jun 2015 20:24:29 +0000 (20:24 +0000)]
Merge "Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants" into mnc-dev
Roozbeh Pournader [Thu, 11 Jun 2015 20:19:28 +0000 (20:19 +0000)]
Merge "Merge EXTENDED font profile with the next (unnamed) profile." into mnc-dev
Jason Monk [Thu, 11 Jun 2015 20:12:09 +0000 (20:12 +0000)]
am
00a34ab5: Merge "Protect against null detail record." into mnc-dev
* commit '
00a34ab54c0e53461586c9596b4f43615319329f':
Protect against null detail record.
Carlos Valdivia [Thu, 11 Jun 2015 20:12:04 +0000 (20:12 +0000)]
am
d0041e5f: Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev
* commit '
d0041e5f474f4e795d6bc9e5eeaec4098949897c':
Revert "Permissions: Fix account related permissions."
Roozbeh Pournader [Thu, 11 Jun 2015 17:26:13 +0000 (10:26 -0700)]
Merge EXTENDED font profile with the next (unnamed) profile.
This is now possible since we have less space restrictions on
devices.
This helps make sure that devices don't mistakenly ship with a
limited font support simply because they didn't turn on the extended
font profile.
Although the larger version of Droid Sans Fallback is no longer used
in any font profile for a device, it is kept since it's used by the
SDK.
The Nanum Gothic font is no longer used in any device profile either,
but it's kept in the fallback chain, so the SDK (that uses it)
continues to work.
Bug:
19668057
Change-Id: I6e32c4c98745e9b6aff6684d993943a19aebf6f7
Jason Monk [Thu, 11 Jun 2015 20:06:10 +0000 (20:06 +0000)]
Merge "Protect against null detail record." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 20:05:38 +0000 (20:05 +0000)]
am
c8488e99: Merge "Ignore some more generic USB device names." into mnc-dev
* commit '
c8488e99e85ae5252e6078c00d123f1364aef25d':
Ignore some more generic USB device names.
Chris Craik [Thu, 11 Jun 2015 20:05:33 +0000 (20:05 +0000)]
am
31f50838: am
e22c59b2: Trace each stage of Choreographer driven frames
* commit '
31f50838357f8017721ba198c2cf6ddb733c378f':
Trace each stage of Choreographer driven frames
Makoto Onuki [Thu, 11 Jun 2015 20:05:28 +0000 (20:05 +0000)]
am
cc0c8a48: am
bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev
* commit '
cc0c8a48422e0bb5a1f699fdb12d12691004fe7c':
Fix the PFD detachFd issue.
Eino-Ville Talvala [Thu, 11 Jun 2015 20:05:24 +0000 (20:05 +0000)]
am
e4112744: am
cd17a84a: Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev
* commit '
e411274447a266e4637ec7f5eee7262a796712a7':
Add more specific consumer names for common buffer queue endpoints.
Carlos Valdivia [Thu, 11 Jun 2015 20:04:31 +0000 (20:04 +0000)]
Merge "Revert "Permissions: Fix account related permissions."" into mnc-dev
Carlos Valdivia [Thu, 11 Jun 2015 20:04:04 +0000 (20:04 +0000)]
Revert "Permissions: Fix account related permissions."
This reverts commit
ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814.
Change-Id: I4c62b1b5a5bd4e2a5fac76244a16730526ed67fc
Chris Craik [Thu, 11 Jun 2015 19:59:34 +0000 (19:59 +0000)]
am
e22c59b2: Trace each stage of Choreographer driven frames
* commit '
e22c59b2913578c24e86673576d009d34306f6be':
Trace each stage of Choreographer driven frames
Yin-Chia Yeh [Wed, 10 Jun 2015 17:59:40 +0000 (10:59 -0700)]
Camera2: Legacy: handle FPS range properly
Convert between the FPS range unit of API1 and API2.
Bug:
21754853
Change-Id: I823e533eeac3bf8beb7b975fe296b309300e2b05
Jason Monk [Thu, 11 Jun 2015 19:57:41 +0000 (15:57 -0400)]
Protect against null detail record.
Bug:
21779477
Change-Id: I70abe5d88f7ca0db782182937f5b73a9e9be1f5a
Jeff Sharkey [Thu, 11 Jun 2015 19:57:23 +0000 (19:57 +0000)]
Merge "Ignore some more generic USB device names." into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 19:47:24 +0000 (12:47 -0700)]
Ignore some more generic USB device names.
Bug:
21376386
Change-Id: I8c1b1cf9d881ad2795e9b15740ff511260572f1b
Makoto Onuki [Thu, 11 Jun 2015 19:53:43 +0000 (19:53 +0000)]
am
bf2ccf94: Merge "Fix the PFD detachFd issue." into mnc-dev
* commit '
bf2ccf9455619ac8593319cf5814f2c665656c5e':
Fix the PFD detachFd issue.
Eino-Ville Talvala [Thu, 11 Jun 2015 19:53:36 +0000 (19:53 +0000)]
am
cd17a84a: Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev
* commit '
cd17a84a860769049806c8a7fe80d274edcd950d':
Add more specific consumer names for common buffer queue endpoints.
Chris Craik [Fri, 22 May 2015 01:33:37 +0000 (18:33 -0700)]
Trace each stage of Choreographer driven frames
bug:
21374535
Change-Id: I332dac216defbc4517441e2a9cdffdf71731f1e6
Makoto Onuki [Thu, 11 Jun 2015 19:39:15 +0000 (19:39 +0000)]
Merge "Fix the PFD detachFd issue." into mnc-dev
Eino-Ville Talvala [Thu, 11 Jun 2015 19:36:15 +0000 (19:36 +0000)]
Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev
Makoto Onuki [Thu, 11 Jun 2015 19:34:22 +0000 (12:34 -0700)]
Fix the PFD detachFd issue.
Bug
18566244
Change-Id: I410b2219e08c9108236e2c2926bd613315198703
Adam Lesinski [Wed, 10 Jun 2015 00:34:04 +0000 (17:34 -0700)]
Doze: Use Settings.Global.DEVICE_IDLE_CONSTANTS instead of hardcoded constants
This will allow gservices to tweak the settings and experiment
with different values for various doze constants.
The values are encoded in a string as a key=value list. Ex:
inactive_to=5000,idle_factor=0.01
Bug:
21640379
Change-Id: Ie98a0e4893f9b46a64d961d6c5c5169b8b8ad742
Svet Ganov [Thu, 11 Jun 2015 19:15:43 +0000 (19:15 +0000)]
am
cd6759e4: am
db6ac98e: Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/
20220885" into mnc-dev
* commit '
cd6759e4eff0beb63f16f9d625a35bbbeb8b3b45':
DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/
20220885
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Svet Ganov [Thu, 11 Jun 2015 19:01:05 +0000 (19:01 +0000)]
am
db6ac98e: Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/
20220885" into mnc-dev
* commit '
db6ac98ec375f388d4815fe405201e9649a003f8':
DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/
20220885
Svet Ganov [Thu, 11 Jun 2015 18:52:38 +0000 (18:52 +0000)]
Merge "DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework b/
20220885" into mnc-dev
Svet Ganov [Thu, 11 Jun 2015 18:48:53 +0000 (11:48 -0700)]
DO NOT MERGE Remove SUBSCRIBED_FEEDS permissions from framework
b/
20220885
Instead, move it to GSF:
ag/700092
SUBSCRIBED_FEEDS_READ/WRITE permissions guard the Content Provider
that stores sync feeds for 1p apps (Gmail, Claendar, etc).
The sync feeds are used for delivering and processing
GCM tickle-to-sync messages.
These permissions should not be used by 3rd parties but
if they were, this change will break them.
I don't know the reason these were not in GSF and 'signature'
to begin with. If someone does, please, comment.
Change-Id: I6c4e4c774fea12c7fe7082477c210ad75f007c66
Jeff Sharkey [Thu, 11 Jun 2015 18:35:48 +0000 (18:35 +0000)]
am
415cc610: am
8a265146: Merge "Selected count string needs plurals." into mnc-dev
* commit '
415cc61096e8198e005b42a1172f103016dfc3fc':
Selected count string needs plurals.
Carlos Valdivia [Thu, 11 Jun 2015 18:35:43 +0000 (18:35 +0000)]
am
e262829d: am
ffb46022: Permissions: Fix account related permissions.
* commit '
e262829d0cb2e8117a18bc5b397daa17316acd46':
Permissions: Fix account related permissions.
Jeff Sharkey [Thu, 11 Jun 2015 18:27:55 +0000 (18:27 +0000)]
am
8a265146: Merge "Selected count string needs plurals." into mnc-dev
* commit '
8a26514687ccf651eb73d5acdd3ae7c62d247d97':
Selected count string needs plurals.
Carlos Valdivia [Thu, 11 Jun 2015 18:22:59 +0000 (18:22 +0000)]
am
ffb46022: Permissions: Fix account related permissions.
* commit '
ffb46022b30dffdf1cc4cbd08d4bcbe51e1f8814':
Permissions: Fix account related permissions.
Jeff Sharkey [Thu, 11 Jun 2015 18:21:07 +0000 (18:21 +0000)]
Merge "Selected count string needs plurals." into mnc-dev
Dirk Dougherty [Thu, 11 Jun 2015 18:09:07 +0000 (18:09 +0000)]
am
6776c338: am
cbf63d8a: am
405d58ff: am
fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
* commit '
6776c33808ee4d0075b9b71cb9537afffa5757f6':
Doc change: Remove disallow /preview from indexing.
Hyungtae Tim Kim [Thu, 11 Jun 2015 18:09:03 +0000 (18:09 +0000)]
am
8604a1af: am
d15e2c62: Merge "Add bucket that unknown state playback falls into" into mnc-dev
* commit '
8604a1af70219f61c9f0a1ead6eff7a84687c21c':
Add bucket that unknown state playback falls into
Craig Lafayette [Thu, 11 Jun 2015 18:08:58 +0000 (18:08 +0000)]
am
7ff09f2b: am
77b2d49a: Merge "Remove device initializer status messages" into mnc-dev
* commit '
7ff09f2be0be1ad5f9c7b9dce31084522fb30608':
Remove device initializer status messages
Alex Klyubin [Thu, 11 Jun 2015 18:08:53 +0000 (18:08 +0000)]
am
4b667347: am
96d7058a: Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev
* commit '
4b667347f25e8ae27602a0f4905b69cd65fb28c8':
Android Keystore keys are no longer backed by Conscrypt.
Carlos Valdivia [Tue, 9 Jun 2015 02:07:54 +0000 (19:07 -0700)]
Permissions: Fix account related permissions.
Requires updating the docs in AccountManaager as well as the logic in
AccountManagerService.
MANAGE_ACCOUNTS, USE_CREDENTIALS, and AUTHENTCATE_ACCOUNTS are going
away. Where AUTHENTCATE_ACCOUNTS was required we now do signature
matching.
GET_ACCOUNTS is kept but has been grouped under contacts.
Bug:
20136477
Change-Id: Iabbb76dce8d1efc607c1f107911d7ddab598a481
Dirk Dougherty [Thu, 11 Jun 2015 18:05:06 +0000 (18:05 +0000)]
am
cbf63d8a: am
405d58ff: am
fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
* commit '
cbf63d8abab1980d290d02e2d5ebdd7e1d70298f':
Doc change: Remove disallow /preview from indexing.
Hyungtae Tim Kim [Thu, 11 Jun 2015 18:05:01 +0000 (18:05 +0000)]
am
d15e2c62: Merge "Add bucket that unknown state playback falls into" into mnc-dev
* commit '
d15e2c62e8cf6634376326fc35ad28829c5fc109':
Add bucket that unknown state playback falls into
Dirk Dougherty [Thu, 11 Jun 2015 17:57:37 +0000 (17:57 +0000)]
am
405d58ff: am
fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
* commit '
405d58fff8a64833f365893d065edf3d17f60f21':
Doc change: Remove disallow /preview from indexing.
Craig Lafayette [Thu, 11 Jun 2015 17:56:00 +0000 (17:56 +0000)]
am
77b2d49a: Merge "Remove device initializer status messages" into mnc-dev
* commit '
77b2d49abb38fafb91fb99ce603a92f189553cd7':
Remove device initializer status messages
Alex Klyubin [Thu, 11 Jun 2015 17:55:54 +0000 (17:55 +0000)]
am
96d7058a: Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev
* commit '
96d7058aaaf58a0c6a2bfb296c5950b2e7e37d37':
Android Keystore keys are no longer backed by Conscrypt.
Hyungtae Tim Kim [Thu, 11 Jun 2015 17:53:15 +0000 (17:53 +0000)]
Merge "Add bucket that unknown state playback falls into" into mnc-dev
Craig Lafayette [Thu, 11 Jun 2015 17:45:01 +0000 (17:45 +0000)]
Merge "Remove device initializer status messages" into mnc-dev
Dirk Dougherty [Thu, 11 Jun 2015 17:40:53 +0000 (17:40 +0000)]
am
fd743227: Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
* commit '
fd7432276172790a27bd51b75e61d756772eb33b':
Doc change: Remove disallow /preview from indexing.
Adam Powell [Thu, 11 Jun 2015 17:40:18 +0000 (17:40 +0000)]
am
5c3f408c: am
98b40aac: Merge "Disable ResolverComparator\'s debug logging" into mnc-dev
* commit '
5c3f408c29451c2dff45d9d5edc4534d239d8700':
Disable ResolverComparator's debug logging
Alex Klyubin [Thu, 11 Jun 2015 17:40:07 +0000 (17:40 +0000)]
Merge "Android Keystore keys are no longer backed by Conscrypt." into mnc-dev
Dirk Dougherty [Thu, 11 Jun 2015 17:31:44 +0000 (17:31 +0000)]
Merge "Doc change: Remove disallow /preview from indexing." into mnc-preview-docs
Adam Powell [Thu, 11 Jun 2015 17:26:50 +0000 (17:26 +0000)]
am
98b40aac: Merge "Disable ResolverComparator\'s debug logging" into mnc-dev
* commit '
98b40aac8399d8befc5099955a34ce54df477d8f':
Disable ResolverComparator's debug logging
Joe Fernandez [Thu, 11 Jun 2015 17:14:25 +0000 (17:14 +0000)]
am
81d7317a: am
3e634d93: am
fd7a6b03: am
d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs
* commit '
81d7317a1b1a459178a90a2c0c39aebb32bcb5c7':
Revert "Revert "docs: studio 1.2.2.0 updates""
Adam Powell [Thu, 11 Jun 2015 17:14:03 +0000 (17:14 +0000)]
Merge "Disable ResolverComparator's debug logging" into mnc-dev
Adam Powell [Thu, 11 Jun 2015 17:08:03 +0000 (10:08 -0700)]
Disable ResolverComparator's debug logging
Change-Id: Ic1df5a7caaadf7076436cbcec6e79bb14ffa1c81
Joe Fernandez [Thu, 11 Jun 2015 17:01:51 +0000 (17:01 +0000)]
am
3e634d93: am
fd7a6b03: am
d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs
* commit '
3e634d93587d06d1dddfbe0b409891b39b92daa6':
Revert "Revert "docs: studio 1.2.2.0 updates""
Joe Fernandez [Thu, 11 Jun 2015 16:47:20 +0000 (16:47 +0000)]
am
fd7a6b03: am
d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs
* commit '
fd7a6b03329606caa4e61eab64435b6407c90bf2':
Revert "Revert "docs: studio 1.2.2.0 updates""
Adrian Roos [Thu, 11 Jun 2015 16:38:46 +0000 (16:38 +0000)]
am
8c9a57fb: am
a6e772c8: Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev
* commit '
8c9a57fbce955a836e01096f44a1d6cd8b2dec75':
Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497
Adrian Roos [Thu, 11 Jun 2015 16:38:41 +0000 (16:38 +0000)]
am
7bb85323: am
5b56be60: Merge "Filter hover events for clipped views" into mnc-dev
* commit '
7bb85323cde91c82a46fb419e27a139c7cddb6a5':
Filter hover events for clipped views
Benjamin Franz [Thu, 11 Jun 2015 16:38:36 +0000 (16:38 +0000)]
am
8b5c2e8a: am
d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev
* commit '
8b5c2e8acd01c87204ba0b842a35c625be174e5b':
Align the behaviour of different lock task modes
Joe Fernandez [Thu, 11 Jun 2015 16:33:02 +0000 (16:33 +0000)]
am
d1d8b843: Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs
* commit '
d1d8b843dd4b7575438339a15e610deafa060f76':
Revert "Revert "docs: studio 1.2.2.0 updates""
Adrian Roos [Thu, 11 Jun 2015 16:26:45 +0000 (16:26 +0000)]
am
a6e772c8: Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev
* commit '
a6e772c822b9095898b6611df0bedf95f445ca6e':
Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497
Adrian Roos [Thu, 11 Jun 2015 16:26:41 +0000 (16:26 +0000)]
am
5b56be60: Merge "Filter hover events for clipped views" into mnc-dev
* commit '
5b56be608942e61a5e3e0e625f4c032f9ed39808':
Filter hover events for clipped views
Benjamin Franz [Thu, 11 Jun 2015 16:26:36 +0000 (16:26 +0000)]
am
d168d184: Merge "Align the behaviour of different lock task modes" into mnc-dev
* commit '
d168d184c02c33863b4eda56fae431437f609e2c':
Align the behaviour of different lock task modes
Adrian Roos [Thu, 11 Jun 2015 16:24:28 +0000 (16:24 +0000)]
Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev
Joe Fernandez [Thu, 11 Jun 2015 16:24:24 +0000 (16:24 +0000)]
Merge "Revert "Revert "docs: studio 1.2.2.0 updates""" into mnc-preview-docs
Adrian Roos [Thu, 11 Jun 2015 16:24:09 +0000 (16:24 +0000)]
Merge "Filter hover events for clipped views" into mnc-dev
Jeff Sharkey [Thu, 11 Jun 2015 16:16:19 +0000 (09:16 -0700)]
Selected count string needs plurals.
Bug:
21717427
Change-Id: Ie0db8ac30244b022ca5838969fb085230bfc4499
Benjamin Franz [Thu, 11 Jun 2015 16:15:34 +0000 (16:15 +0000)]
Merge "Align the behaviour of different lock task modes" into mnc-dev
Jonathan Basseri [Thu, 11 Jun 2015 16:01:33 +0000 (16:01 +0000)]
am
b0d61c9b: am
b2af4220: Merge "Delete TODO and file a bug." into mnc-dev
* commit '
b0d61c9b806bae9619e81c6a5bda3308a66a4d2a':
Delete TODO and file a bug.
Jonathan Basseri [Thu, 11 Jun 2015 15:49:29 +0000 (15:49 +0000)]
am
b2af4220: Merge "Delete TODO and file a bug." into mnc-dev
* commit '
b2af4220adccb68c67bc91022db6239a9b9e280b':
Delete TODO and file a bug.
Jonathan Basseri [Thu, 11 Jun 2015 15:36:32 +0000 (15:36 +0000)]
Merge "Delete TODO and file a bug." into mnc-dev
Hyungtae Tim Kim [Wed, 10 Jun 2015 21:35:28 +0000 (14:35 -0700)]
Add bucket that unknown state playback falls into
MediaPlayerStressTest some media files are missing on the results as they
were reported neither completed nor erroneous.
This case will fall into a new category named unknown playback state so that
we could track them in media dashboard.
Bug:
21755950
Change-Id: Iefcc3e375c63d952a7d9edb418208209d87b9e08
Dan Sandler [Thu, 11 Jun 2015 15:19:26 +0000 (15:19 +0000)]
am
bfc5c21c: am
31ae9936: Merge "A11y: Annotate the QS brightness slider properly." into mnc-dev
* commit '
bfc5c21c4abf7561788eab0f088841d8cf15d631':
A11y: Annotate the QS brightness slider properly.
Dan Sandler [Thu, 11 Jun 2015 15:04:56 +0000 (15:04 +0000)]
am
31ae9936: Merge "A11y: Annotate the QS brightness slider properly." into mnc-dev
* commit '
31ae9936a63f484dd872baa7657c4ce79f27d7ce':
A11y: Annotate the QS brightness slider properly.
Dan Sandler [Thu, 11 Jun 2015 14:55:00 +0000 (14:55 +0000)]
Merge "A11y: Annotate the QS brightness slider properly." into mnc-dev
Dan Sandler [Thu, 11 Jun 2015 13:56:24 +0000 (09:56 -0400)]
A11y: Annotate the QS brightness slider properly.
Instead of just clobbering SeekBar's awesome feedback with
"Display brightness" right on the slider, we move that
string up to the parent and set it as the slider's label.
The new utterance will be: "<standard seekbar feedback> for
<label>", which in this case comes out as:
"Seek control, fifteen percent, for display brightness."
Bug:
20343730
Change-Id: I1223b3b07b6bf67ee3df22094ec5976b5188d968
Jason Monk [Thu, 11 Jun 2015 14:23:49 +0000 (14:23 +0000)]
am
09f2bc95: am
08f247fe: Merge "Fix rotation tile animation" into mnc-dev
* commit '
09f2bc952ff10582f9f7bde7fd7e0b8666f6aa4c':
Fix rotation tile animation
John Spurlock [Thu, 11 Jun 2015 14:23:44 +0000 (14:23 +0000)]
am
a03c1050: am
c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev
* commit '
a03c1050e46a4bab2f1e532d295ab269e98471ac':
Volume: Disable seekbar prefs when zen muted.
Joseph Wen [Thu, 11 Jun 2015 14:23:38 +0000 (14:23 +0000)]
am
d343c8de: am
2dd827ae: Merge "Update Statement Service" into mnc-dev
* commit '
d343c8de90d84f2325f9996aad51059f6453d8f2':
Update Statement Service
Jason Monk [Thu, 11 Jun 2015 14:16:54 +0000 (14:16 +0000)]
am
08f247fe: Merge "Fix rotation tile animation" into mnc-dev
* commit '
08f247fe2e073a5ec62dc0469d83f514aab31c42':
Fix rotation tile animation
John Spurlock [Thu, 11 Jun 2015 14:16:50 +0000 (14:16 +0000)]
am
c110887c: Merge "Volume: Disable seekbar prefs when zen muted." into mnc-dev
* commit '
c110887c2ad9de1de5154ac67740c6a0860fa016':
Volume: Disable seekbar prefs when zen muted.
OSDN Git Service
