Dan Sandler
c637ea4ac6
Merge \"Purr. am: 610f6ede25 am: 45294a6859\" into nyc-mr1-dev-plus-aosp
...
am: 477d47fa04
2016-06-28 08:20:40 +00:00
Dan Sandler
9abce5c6d7
Merge \"Fix SuperNotCalledException. am: 04f8cc2bb3 am: 33a199e241\" into nyc-mr1-dev-plus-aosp
...
am: c2fbd0ce33
2016-06-28 08:20:36 +00:00
Dan Sandler
0e272e6593
One final tweak to the platlogo. am: 4b7e415803 am: 3fae8ae0c6
...
am: 5643d0a5f8
2016-06-28 08:20:34 +00:00
Dan Sandler
8efcd56684
Fix SuperNotCalledException. am: 04f8cc2bb3 am: ed48cbc8fc
...
am: ca3a67d156
2016-06-28 08:20:31 +00:00
Hall Liu
674b428456
Merge \\"Add disable add call during video call extra and carrier config key\\" into nyc-mr1-dev am: 2cd8281a23
...
am: 2258e483f1
2016-06-28 08:20:24 +00:00
Android Build Merger (Role)
477d47fa04
Merge "Purr. am: 610f6ede25 am: 45294a6859" into nyc-mr1-dev-plus-aosp
2016-06-28 07:15:42 +00:00
Android Build Merger (Role)
c2fbd0ce33
Merge "Fix SuperNotCalledException. am: 04f8cc2bb3 am: 33a199e241" into nyc-mr1-dev-plus-aosp
2016-06-28 07:15:34 +00:00
Dan Sandler
de924625ca
Purr. am: 610f6ede25
...
am: 45294a6859
2016-06-28 07:14:56 +00:00
Dan Sandler
9c00b0d951
Fix SuperNotCalledException. am: 04f8cc2bb3
...
am: 33a199e241
2016-06-28 07:14:56 +00:00
Dan Sandler
5643d0a5f8
One final tweak to the platlogo. am: 4b7e415803
...
am: 3fae8ae0c6
2016-06-28 07:14:54 +00:00
Dan Sandler
ca3a67d156
Fix SuperNotCalledException. am: 04f8cc2bb3
...
am: ed48cbc8fc
2016-06-28 07:14:51 +00:00
Dan Sandler
45294a6859
Purr.
...
am: 610f6ede25
2016-06-28 07:07:35 +00:00
Dan Sandler
3fae8ae0c6
One final tweak to the platlogo.
...
am: 4b7e415803
2016-06-28 07:07:31 +00:00
Dan Sandler
ed48cbc8fc
Fix SuperNotCalledException.
...
am: 04f8cc2bb3
2016-06-28 07:07:28 +00:00
Dan Sandler
33a199e241
Fix SuperNotCalledException.
...
am: 04f8cc2bb3
2016-06-28 07:07:20 +00:00
TreeHugger Robot
c8fc16ca1c
Merge "Delete gender-balanced emoji sequence by one backspace key event."
2016-06-28 06:54:58 +00:00
Dan Sandler
610f6ede25
Purr.
...
Bug: 27376882
Change-Id: I071d00c9a7847b8ff9b263ffd17581079b78a432
2016-06-28 01:25:08 -04:00
Seigo Nonaka
bba8d97c36
Delete gender-balanced emoji sequence by one backspace key event.
...
The gender-balanced emojis are made with ZWJ sequence and emoji
modifiers. For example, U+1F469 U+1F3FD U+200D U+1F4BC should be
deleted at the same time by single backsapce key event. Here, U+1F469
is WOMAN, U+1F3FD is EMOJI MODIFIER FITZPATRICK TYPE-4, U+200D is ZERO
WIDTH JOINER, U+1F4BC is BRIEFCASE.
This CL also renames the state name from STATE_BEFORE_ZWJ_EMOJI to
STATE_BEFORE_EMOJI since now all emoji can be a part of ZWJ sequence
after I572dad42ee108476962d4b3fe9f3a6019cb50098
BUG: 29728397
Change-Id: Ib114295db45c6592f1c65a0773ab236f8bf35209
2016-06-28 13:54:19 +09:00
Dan Sandler
4b7e415803
One final tweak to the platlogo.
...
Bug: 27376882
Change-Id: Ie60600018204f48593975b947d6fc10f4dd8a69f
2016-06-27 22:59:24 -04:00
Dan Sandler
04f8cc2bb3
Fix SuperNotCalledException.
...
Q. Dan, how did you make such a basic newbie mistake?
A. new phone who dis
Bug: 29779845
Change-Id: Iecba53effcf6252df228afd2cc80df43b2afaa59
2016-06-27 22:59:24 -04:00
Hall Liu
2258e483f1
Merge \"Add disable add call during video call extra and carrier config key\" into nyc-mr1-dev
...
am: 2cd8281a23
2016-06-28 02:34:00 +00:00
Hall Liu
2cd8281a23
Merge "Add disable add call during video call extra and carrier config key" into nyc-mr1-dev
2016-06-28 02:29:05 +00:00
John Reck
a1a0bbddba
Merge \\"Fix SurfaceViewPositionListener race bugs\\" into nyc-mr1-dev am: 8701bff9ba
...
am: 892f8e7d4f
2016-06-28 01:36:19 +00:00
John Reck
892f8e7d4f
Merge \"Fix SurfaceViewPositionListener race bugs\" into nyc-mr1-dev
...
am: 8701bff9ba
2016-06-28 01:31:02 +00:00
TreeHugger Robot
8701bff9ba
Merge "Fix SurfaceViewPositionListener race bugs" into nyc-mr1-dev
2016-06-28 01:26:43 +00:00
Amith Yamasani
e08cb99a52
Merge \\"Add tron logging for retail demo session counters\\" into nyc-mr1-dev am: 30a2b43f6d
...
am: 42daac6289
2016-06-28 01:12:39 +00:00
Amith Yamasani
42daac6289
Merge \"Add tron logging for retail demo session counters\" into nyc-mr1-dev
...
am: 30a2b43f6d
2016-06-28 01:06:47 +00:00
Amith Yamasani
30a2b43f6d
Merge "Add tron logging for retail demo session counters" into nyc-mr1-dev
2016-06-28 01:03:17 +00:00
Svetoslav Ganov
3c4fd1280f
Merge \"Merge \\\"Mark app pending intents in notification extras\\\" into nyc-dev am: b2cd9c95bf am: 7878e736f7\" into nyc-mr1-dev-plus-aosp
...
am: fdf2884ded
2016-06-28 00:57:03 +00:00
Svet Ganov
7f344e4c9c
Merge \\\"Mark app pending intents in notification extras\\\" into nyc-dev am: b2cd9c95bf am: 5f7f3fa7a9
...
am: dc162dde07
2016-06-28 00:57:00 +00:00
Android Build Merger (Role)
fdf2884ded
Merge "Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf am: 7878e736f7" into nyc-mr1-dev-plus-aosp
2016-06-28 00:52:38 +00:00
Svetoslav Ganov
cd6c2bee62
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
...
am: 7878e736f7
2016-06-28 00:52:04 +00:00
Svetoslav Ganov
dc162dde07
Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
...
am: 5f7f3fa7a9
2016-06-28 00:52:01 +00:00
Svet Ganov
5f7f3fa7a9
Merge \"Mark app pending intents in notification extras\" into nyc-dev
...
am: b2cd9c95bf
2016-06-28 00:46:58 +00:00
Svet Ganov
7878e736f7
Merge \"Mark app pending intents in notification extras\" into nyc-dev
...
am: b2cd9c95bf
2016-06-28 00:46:55 +00:00
Svetoslav Ganov
b2cd9c95bf
Merge "Mark app pending intents in notification extras" into nyc-dev
2016-06-28 00:42:24 +00:00
Svet Ganov
ddb948896c
Mark app pending intents in notification extras
...
We need to make every peniding intent that went in the notification
system to allow special handling of such intents when fired by a
notification listener. If a pending intent from a notification
is sent from a notification listener, we white-list the source app
to run in data saver mode for a short period of time. The problem is
that actions and the notificaion can have extras which bundles may
contain pending intents but the system cannot look into the bundles
as they may contain custom parcelable objects. To address this we
keep a list of all pending intents in the notification allowing
the system to access them without touching the bundle. Currently
the pending intents are written to the parcel twice, once in the
bundle and once as the explicit list. We can come up with a scheme
to optimize this but since pending itents are just a binder pointer
it is not worth the excecise.
bug:29480440
Change-Id: I7328a47017ca226117adf7054900836619f5679b
2016-06-27 17:32:25 -07:00
Hall Liu
10208661cd
Add disable add call during video call extra and carrier config key
...
Bug: 29047863
Change-Id: I977041ec72968bdccc69a706e27dd4b5ec336ba7
2016-06-27 17:19:59 -07:00
Jorim Jaggi
00f225ab84
Merge \"Merge \\\"Fix smooth panel deceleration\\\" into nyc-dev am: e858432241 am: f4704889a6\" into nyc-mr1-dev-plus-aosp
...
am: c06f2dd896
2016-06-28 00:17:53 +00:00
Roozbeh Pournader
50008f0c64
Merge "Introduce listEllipsize() and deprecate commaEllipsize()"
2016-06-28 00:14:23 +00:00
Dianne Hackborn
d41a7bcf4e
Merge \"Merge \\\"Fix bug where process whitelist manager state would not be correct.\\\" into nyc-dev am: a39d380651 am: 91df8559c0\" into nyc-mr1-dev-plus-aosp
...
am: 83bf61d450
2016-06-28 00:12:05 +00:00
Andreas Gampe
1a0a502d47
Merge \"Merge \\"Frameworks/base: Add new flow to OtaDexoptService\\" into nyc-mr1-dev am: d06f87399b\" into nyc-mr1-dev-plus-aosp
...
am: 8299d7156e
2016-06-28 00:12:03 +00:00
Dianne Hackborn
b3bab16341
Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am: 4d6be6b308 am: 9525331c5e
...
am: 7510331afb
2016-06-28 00:11:59 +00:00
Andre Eisenbach
c85997cdf2
Merge \"Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am: 4d6be6b308 am: e7ce279d9a\" into nyc-mr1-dev-plus-aosp
...
am: 70e793436d
2016-06-28 00:11:57 +00:00
Pavlin Radoslavov
a9b0088715
Merge \\\"Add extra waiting when switching users\\\" into nyc-dev am: 4d6be6b308 am: d09f7d0edc
...
am: e655b42708
2016-06-28 00:11:55 +00:00
Christopher Tate
5dba1c64ad
Merge \\\"Fix #29737133 : content-trigger jobs not running properly\\\" into nyc-dev am: f480698298 am: defa943074
...
am: f54b7abdd8
2016-06-28 00:09:40 +00:00
Chris Tate
baf804a3eb
Merge \"Merge \\\"Fix #29737133 : content-trigger jobs not running properly\\\" into nyc-dev am: f480698298 am: 0bdb4cef4a\" into nyc-mr1-dev-plus-aosp
...
am: e2d2c8bfaa
2016-06-28 00:09:38 +00:00
Bill Yi
93426f39cc
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 95ad00d115 -s ours
...
am: f5e54b38aa
2016-06-28 00:09:35 +00:00
Adam Lesinski
550850c257
Merge \\"Fix AttributeCache\\" into nyc-mr1-dev am: bdad0ccf3b
...
am: fd6fdebdd2
2016-06-28 00:09:33 +00:00
John Reck
ec2772efcf
Merge \"Merge \\\"Add missing roundOut for layer damage\\\" into nyc-dev am: 48cde353eb am: 11858f170a\" into nyc-mr1-dev-plus-aosp
...
am: b7a41144ce
2016-06-28 00:09:30 +00:00
