177537 Commits

Author SHA1 Message Date
Joe Fernandez
6ecc6d59f3 am 88b8b4a5: Merge "docs: studio revision update 1.0" into lmp-docs
* commit '88b8b4a5d07ada880698a0130e607ea65bf2c044':
  docs: studio revision update 1.0
2014-12-08 18:44:09 +00:00
Rich Slogar
0039a73bb6 am b7ef7fcd: Merge "docs: skd tools revision 24.0.0" into lmp-docs
* commit 'b7ef7fcd40a9e18fed3c0e8c63f454c44ae2453f':
  docs: skd tools revision 24.0.0
2014-12-08 18:44:05 +00:00
Joe Fernandez
88b8b4a5d0 Merge "docs: studio revision update 1.0" into lmp-docs 2014-12-08 18:41:11 +00:00
Alan Viverette
f1792c4219 Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev 2014-12-08 18:39:56 +00:00
Rich Slogar
3c2508ccbc docs: studio revision update 1.0
Change-Id: I5d6dc9fc029e45df143fbceba846978d15a6bc4d
2014-12-08 10:38:28 -08:00
Alan Viverette
b942b6f15c Fix hotspot coordinate propagation in ViewGroup and AbsListView
There was a weird disconnect between setPressed() and hotspot propagation
behavior. This makes hotspot propagation work like setPressed(). Also
fixes ripple animation during drag-to-open.

BUG: 18631557
BUG: 18593243
Change-Id: Id4adf5d815e4d426b4182aac4d0c780f04472ae4
2014-12-08 10:37:39 -08:00
Rich Slogar
b7ef7fcd40 Merge "docs: skd tools revision 24.0.0" into lmp-docs 2014-12-08 18:35:42 +00:00
Winson Chung
87024f7335 am 16158852: Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev
* commit '16158852e2d91041df6d3c031cefe4b77f0583aa':
  Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)
2014-12-08 18:35:11 +00:00
Winson Chung
16158852e2 Merge "Ensure that loading and unloading of tasks happen symmetrically with lifecycle events. (Bug 18574950)" into lmp-mr1-dev 2014-12-08 18:30:41 +00:00
Jorim Jaggi
dacc924a65 Reinspect notification for dark mode when updated
Also protect against a crash that might happen when the notification
is updated during an animation.

Bug: 18572620
Change-Id: Ifd6279df395974f7afd0c708a6c87c64de935c62
2014-12-08 19:24:35 +01:00
smain@google.com
54403cf8eb am 97afbe1e: am 39519067: am a4924046: am d48168bd: add survey link
* commit '97afbe1e875b0ba5f5394b924a4d0d38e051c40c':
  add survey link
2014-12-08 18:23:23 +00:00
smain@google.com
97afbe1e87 am 39519067: am a4924046: am d48168bd: add survey link
* commit '395190677efb61863de82ba6ce4eeb42311dfe7a':
  add survey link
2014-12-08 18:16:01 +00:00
smain@google.com
395190677e am a4924046: am d48168bd: add survey link
* commit 'a4924046b936a5821b90dcbd7a4bd06447430749':
  add survey link
2014-12-08 18:10:16 +00:00
Lajos Molnar
3547de2f15 am 9d6fa062: Merge "media: fix isSupportedFormat for integer frame rate"
* commit '9d6fa062a55c17b7fa08707b1006e7295bf9bc0c':
  media: fix isSupportedFormat for integer frame rate
2014-12-08 18:07:56 +00:00
Lajos Molnar
f5375fbd8e am 38935e6e: Merge "media: allow full range of Vorbis sampling rates"
* commit '38935e6eafc90d491e3a02e15ebb0890b7731473':
  media: allow full range of Vorbis sampling rates
2014-12-08 18:07:49 +00:00
Geoff Mendal
d7be88dc71 am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '878b49dc707961d8797ab750e78d3fb2bb048152':
  Import translations. DO NOT MERGE
2014-12-08 18:04:07 +00:00
Jeff Sharkey
5b41696c56 am a8fb5803: Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev
* commit 'a8fb580379b83b7fc76ee5b99149bbc8a2ce44ab':
  Offer to "merge" subscribers for data usage.
2014-12-08 18:04:02 +00:00
Alan Viverette
3891784f30 am 3ad41537: Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev
* commit '3ad41537100e54d35d48f677eaae7f10934f3a15':
  Adjust edit text layout, ripple alphas to be closer to Material spec
2014-12-08 18:03:54 +00:00
Lajos Molnar
9d6fa062a5 Merge "media: fix isSupportedFormat for integer frame rate" 2014-12-08 18:02:41 +00:00
Lajos Molnar
38935e6eaf Merge "media: allow full range of Vorbis sampling rates" 2014-12-08 18:02:18 +00:00
smain@google.com
a4924046b9 am d48168bd: add survey link
* commit 'd48168bd780f67a9c4a3714d0f551b1f60774d17':
  add survey link
2014-12-08 18:02:12 +00:00
Geoff Mendal
878b49dc70 am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '31a23f3bb81ea78e2320cc0554d3c06424c4cd7f':
  Import translations. DO NOT MERGE
2014-12-08 18:02:08 +00:00
Jeff Sharkey
a8fb580379 Merge "Offer to "merge" subscribers for data usage." into lmp-mr1-dev 2014-12-08 17:57:16 +00:00
Alan Viverette
3ad4153710 Merge "Adjust edit text layout, ripple alphas to be closer to Material spec" into lmp-mr1-dev 2014-12-08 17:57:16 +00:00
Geoff Mendal
31a23f3bb8 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-12-08 17:56:02 +00:00
Geoff Mendal
3d3a1c3dfe Import translations. DO NOT MERGE
Change-Id: I8afbc01017e4640f25dc5d9be35362bf9273116d
Auto-generated-cl: translation import
2014-12-08 09:54:50 -08:00
smain@google.com
d48168bd78 add survey link
Change-Id: Ic2c107ea99d803ce54d40eacf0e22c340ea03e2b
2014-12-08 09:52:29 -08:00
Rich Slogar
f7c02ed06c docs: skd tools revision 24.0.0
Change-Id: I92be512be8d3c6898b38b400d1777f3dba8bb206
2014-12-08 09:49:00 -08:00
Geoff Mendal
654d8805b2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-08 17:46:53 +00:00
Geoff Mendal
5b571c7a3f Import translations. DO NOT MERGE
Change-Id: Ia87be1197cb5c3a0f5b5ae39384a878fd8e93efb
Auto-generated-cl: translation import
2014-12-08 09:44:34 -08:00
Jorim Jaggi
10ad761aa9 Update dark mode when notification is updated
When the template of a notification changes during a notification
update, we reinflate all the views but didn't update the dark mode.

Bug: 18537470
Change-Id: Iab9278adcbe3bdf39f86019e61b252db0dda7390
2014-12-08 18:41:11 +01:00
John Spurlock
20a46fb14f am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev
* commit '2ea3650d18ab0ce4dba2cee101d639400b411452':
  Zen: New behavior for built-in downtime + nextalarm conditions.
2014-12-08 16:52:49 +00:00
John Spurlock
2ea3650d18 Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev 2014-12-08 16:47:28 +00:00
Geoff Mendal
fb293b9f9d am 9eb2092e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '9eb2092ea146faa21b8c6e0e512c03fc67a09dda':
  Import translations. DO NOT MERGE
2014-12-08 16:45:32 +00:00
Jeff Sharkey
3256601f5e Offer to "merge" subscribers for data usage.
There are some cases where multiple subscriber identities (IMSI)
should be treated as "merged together" from a data usage
perspective.  This is done by extending the template used for
matching purposes to support multiple subscribers.

Then, when we query historical usage or set network policies, we
normalize the matching template to merge to any other identities
that should be included.  When normalizing, the "lowest" identity
is always used for equality and storage purposes, which allows
identities to come and go over time.

This change also fixes data usage recording for multi-SIM devices
by passing along the concrete subscriber identity for each network
interface.  Also correctly create default policies for multi-SIM
devices.  This change also drops setPolicyDataEnable() until it can
be wired up to the right underlying NetworkAgent.  (This means we
still bring up the network, and then rely on iptables rules to block
traffic when over the limit, instead of proactively disabling the
connection.)

Bug: 18012787
Change-Id: If6acf32009fdfea2b836f5aff8e2f3e5e0248b4a
2014-12-08 08:42:59 -08:00
Geoff Mendal
9eb2092ea1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-08 16:40:55 +00:00
smain@google.com
8bd51aa52d am 983ba2ba: am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step
* commit '983ba2ba072860200423e77ebe159bb0d18af36c':
  fix migrate instruction step
2014-12-08 16:38:19 +00:00
smain@google.com
983ba2ba07 am 9a379e73: am 341c518f: am 43838855: fix migrate instruction step
* commit '9a379e73cb7deb3157fa20d83d848cfb9d5d87ff':
  fix migrate instruction step
2014-12-08 16:31:34 +00:00
smain@google.com
9a379e73cb am 341c518f: am 43838855: fix migrate instruction step
* commit '341c518f88411050a2dfa6b4283540acdc265c5e':
  fix migrate instruction step
2014-12-08 16:24:46 +00:00
smain@google.com
341c518f88 am 43838855: fix migrate instruction step
* commit '43838855754bb035c5fb06fe57ec2a089011b866':
  fix migrate instruction step
2014-12-08 16:16:35 +00:00
smain@google.com
4383885575 fix migrate instruction step
Change-Id: I28cf353f2b21d06ee256673590501487f8645b05
2014-12-08 08:07:14 -08:00
Geoff Mendal
2119b65f83 Import translations. DO NOT MERGE
Change-Id: Iafa118acf3037310f0b60425500b21a714103406
Auto-generated-cl: translation import
2014-12-08 08:07:06 -08:00
John Spurlock
530052a2fe Zen: New behavior for built-in downtime + nextalarm conditions.
- Downtime: Allow user to enter downtime early, offer as an end
   condition four hours before downtime starts.  Available in
   either none or priority, regardless of settings configuration.
 - Downtime: Always exit before next alarm if zen=none.
 - Downtime: Make more like any other condition provider, remove
   special status (mostly).
 - Downtime: New auto-triggering rules, allow triggering after a
   manual condition ends, once.
 - Decouple NextAlarm + Downtime providers, allow them to offer
   their conditions at the same time.
 - Downtime/NextAlarm: Update conditions if they change while being
   requested, even if unsubscribed.
 - Make all three built-in condition providers optional, via config.
 - New internal helper for runtime config.
 - Don't follow changes to next alarm, consider the condition false.
 - Isolate downtime calendar logic into separate class (for testing).
 - Allow a:bb -> a:bb as a valid downtime range (all day).
 - Volume dialog: configuration establishes maximum number of visible
   conditions, including built-ins.
 - Zen mode panel: avoid widget updates during layout transition.
 - Zen mode panel: move controller callers to background thread.
 - Zen mode panel: hide/show/rebind rows instead of adding/removing.
 - ZenLog: Add downtime autotrigger results.
 - Volume panel: Smarter refresh on ringer/zen changes.

Bug: 16373455

Change-Id: I4f801018ddb0beb6eb9fa03a81c79f7949888a3f
2014-12-08 11:00:57 -05:00
Jinsuk Kim
33697d859f am 78a73577: Merge "CEC: Update CEC device info properly" into lmp-mr1-dev
* commit '78a7357787406220c4c2459f8d25a0175ac98347':
  CEC: Update CEC device info properly
2014-12-08 15:49:13 +00:00
Jinsuk Kim
78a7357787 Merge "CEC: Update CEC device info properly" into lmp-mr1-dev 2014-12-08 15:43:35 +00:00
Jinsuk Kim
6102bac706 CEC: Update CEC device info properly
CEC device information cannot be updated/notified properly if
the device was plugged to other port. This change makes
sure the updated information is reflected by device event
callback listeners.

Bug: 18513567
Change-Id: I62bbb741d3f89e225a50f86e315da014832d8118
2014-12-09 00:42:37 +09:00
Geoff Mendal
a551f6c860 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-08 15:10:57 +00:00
Geoff Mendal
b266393ecd am b9f245d4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'b9f245d4645e4f3ed47a2a587540505576b96524':
  Import translations. DO NOT MERGE
2014-12-08 15:07:27 +00:00
Geoff Mendal
dd4b3c74b1 Import translations. DO NOT MERGE
Change-Id: I8c505596a581cd34249251e9c5b040eefd049bb4
Auto-generated-cl: translation import
2014-12-08 07:06:02 -08:00
Geoff Mendal
b9f245d464 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-08 15:02:17 +00:00