Commit Graph

68166 Commits

Author SHA1 Message Date
Kirill Grouchnikov
1c6e6dcfd7 Merge "Fix RemoteViews Javadocs for a couple of methods." 2016-06-28 20:35:35 +00:00
Kirill Grouchnikov
c5b30108bb Fix RemoteViews Javadocs for a couple of methods.
Change-Id: Ie87003bcb0d0c43185e5482e91faee84a798aaee
2016-06-28 15:34:13 -04:00
Todd Kennedy
e6c821a812 Merge \\\"Default minSdkVersion to \\\'1\\\'\\\" into nyc-dev am: a98e3e3ede am: a1066ed6c2
am: e3cc3d8ad4

Change-Id: I42b6c96d661f4f8b3036513303f319c010c00485
2016-06-28 19:27:33 +00:00
Todd Kennedy
e3cc3d8ad4 Merge \\"Default minSdkVersion to \\'1\\'\\" into nyc-dev am: a98e3e3ede
am: a1066ed6c2

Change-Id: I58d97cd42bc939a91d00bd6189a1c2ffcc913b37
2016-06-28 19:22:25 +00:00
Todd Kennedy
a1066ed6c2 Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede

Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
2016-06-28 19:16:40 +00:00
Todd Kennedy
4f6570878c Default minSdkVersion to '1'
Exception when targetSdkVersion is a letter API [eg 'N']. While this
is technically not according to the external docs, it's the behaviour
with prior platforms.

Bug: 29817839
Change-Id: I8382909dbe62de7b2ddfb7995ce11d5c2f43372e
2016-06-28 10:31:05 -07:00
Kirill Grouchnikov
55ec63ec33 Merge "Fix a typo in Javadocs" 2016-06-28 15:57:43 +00:00
Chris Banes
612390dce6 Merge "Make Toolbar ignore its minHeight if larger than height" 2016-06-28 15:52:55 +00:00
Kirill Grouchnikov
9091df0fe2 Fix a typo in Javadocs
Change-Id: I450b2b239bd405c58b9f63663ebdf8f73ea38ae5
2016-06-28 11:24:04 -04:00
Chris Banes
8053117a3d Make Toolbar ignore its minHeight if larger than height
Currently Toolbar lays out all children based on its
minHeight (if set). If that minHeight is larger than
the Toolbar height, then the children are laid out larger
than the Toolbar and clipped.

This CL fixes it back by capping the alignment height.

BUG: 29049143

Change-Id: Ia3389a906b132bb0a2ae41b27116c00744d0ddf4
2016-06-28 09:38:29 +01:00
Dan Sandler
0e272e6593 One final tweak to the platlogo. am: 4b7e415803 am: 3fae8ae0c6
am: 5643d0a5f8

Change-Id: Ic1ebdee84229863d6146fac0974ab31379165e6f
2016-06-28 08:20:34 +00:00
Dan Sandler
5643d0a5f8 One final tweak to the platlogo. am: 4b7e415803
am: 3fae8ae0c6

Change-Id: Icf198e2c7d34703a4cd8856bc08f31925a20b622
2016-06-28 07:14:54 +00:00
Dan Sandler
3fae8ae0c6 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ieef461bb4c1b59fd22e5f830b2b25311422cedae
2016-06-28 07:07:31 +00:00
Dan Sandler
d930306e13 One final tweak to the platlogo.
am: 4b7e415803

Change-Id: Ibbe66c569c0be5fc1801d8af9b5810ac997854d8
2016-06-28 07:07:22 +00:00
TreeHugger Robot
c8fc16ca1c Merge "Delete gender-balanced emoji sequence by one backspace key event." 2016-06-28 06:54:58 +00: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
Svet Ganov
7f344e4c9c Merge \\\"Mark app pending intents in notification extras\\\" into nyc-dev am: b2cd9c95bf am: 5f7f3fa7a9
am: dc162dde07

Change-Id: I42000bbb614139ee3f0d9a9fcee7f460e52661f8
2016-06-28 00:57:00 +00:00
Svetoslav Ganov
dc162dde07 Merge \\"Mark app pending intents in notification extras\\" into nyc-dev am: b2cd9c95bf
am: 5f7f3fa7a9

Change-Id: Id4bc3ae0c1d79174a22d669dccab3391c231357d
2016-06-28 00:52:01 +00:00
Svet Ganov
5f7f3fa7a9 Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Iac3970763cbaac36ede1b17df7e65001ad6c8447
2016-06-28 00:46:58 +00:00
Svet Ganov
7878e736f7 Merge \"Mark app pending intents in notification extras\" into nyc-dev
am: b2cd9c95bf

Change-Id: Idb515255f224c23d60a513713d9e4f93decd7a9c
2016-06-28 00:46:55 +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
Roozbeh Pournader
50008f0c64 Merge "Introduce listEllipsize() and deprecate commaEllipsize()" 2016-06-28 00:14:23 +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

Change-Id: I61e73af556b718e58b14a7fed707c7520e3673d9
2016-06-28 00:12:03 +00:00
Andreas Gampe
bd2503e5f4 Merge \"Frameworks/base: Add new flow to OtaDexoptService\" into nyc-mr1-dev
am: d06f87399b

Change-Id: Iaefa3414cb7ca7d113e9ac776f8f667d5dc724c8
2016-06-28 00:00:13 +00:00
TreeHugger Robot
d06f87399b Merge "Frameworks/base: Add new flow to OtaDexoptService" into nyc-mr1-dev 2016-06-27 23:50:37 +00:00
Andreas Gampe
cc241a580c Frameworks/base: Add new flow to OtaDexoptService
Add functionality to capture/intercept installd communication, and
use this to return the full communication for dexopt. These parameters
can be used to drive otapreopt_chroot directly.

Keep the old direct invocation alive until devices have transitioned
to a service that exposes this API.

In preparation for renaming of A/B OTA artifacts to include target
slot names.

Bug: 25612095
Bug: 28069686
Change-Id: I14728ee1266f3882cada8f08dd21891ed5f7a0cb
2016-06-27 15:10:12 -07:00
Yohei Yukawa
a3fd8bfdfe Merge \"Merge \\"Use a flag to grant a temporary URI permission.\\" into nyc-mr1-dev am: cb56978912\" into nyc-mr1-dev-plus-aosp
am: c58ffb3f9c

Change-Id: Iddc693412d20b86c3a916dd09764d14d23c4fcf4
2016-06-27 20:34:58 +00:00
Yohei Yukawa
badcecb2aa Merge \"Use a flag to grant a temporary URI permission.\" into nyc-mr1-dev
am: cb56978912

Change-Id: I20e1481c6f68a5af4f33e699f5bc505b3a4c1457
2016-06-27 20:30:49 +00:00
Yohei Yukawa
cb56978912 Merge "Use a flag to grant a temporary URI permission." into nyc-mr1-dev 2016-06-27 20:18:51 +00:00
Clara Bayarri
b00e3e3785 Merge "Improve Exception message for adding private fragments" 2016-06-27 19:49:09 +00:00
Kirill Grouchnikov
82943ab208 Merge "Don't double-invoke scroll ended listener in animate*" 2016-06-27 19:18:00 +00:00
Steven Ng
4eefd6801c Merge \\"Disallow disable / hide device provision app\\" into nyc-mr1-dev am: dc52eaaa98
am: 8b764a81ef

Change-Id: Id04c937ce560d0446037a495394ec168875782cb
2016-06-27 19:06:14 +00:00
Steven Ng
8b764a81ef Merge \"Disallow disable / hide device provision app\" into nyc-mr1-dev
am: dc52eaaa98

Change-Id: I638ca8d2c03bb75bf4881511db993fdc29961a3e
2016-06-27 18:57:06 +00:00
Steven Ng
dc52eaaa98 Merge "Disallow disable / hide device provision app" into nyc-mr1-dev 2016-06-27 18:50:02 +00:00
Doris Liu
2c0a36a1ec Merge "Rounding per-channel interpolation in ArgbEvaluator to closest integer" 2016-06-27 18:49:51 +00:00
TreeHugger Robot
50b2c2444c Merge "Return proper values from ChangeScroll.getTransitionProperties" 2016-06-27 18:39:14 +00:00
Doris Liu
d0ff41c406 Rounding per-channel interpolation in ArgbEvaluator to closest integer
In case of interpolating between x+1 and x in a color channel, the
previous implementation would jump to x in the *beginning* of the
animation, as it rounds down the interpolated float that's [x, x+1].
This CL rounds the per-channel interpolated float to the closest
integer.

Change-Id: I8610fb14ab3dd0ee2b1816868977c5653c178660
2016-06-27 11:32:35 -07:00
Philip P. Moltmann
127c9715b4 Merge \"Merge \\"Do not remove handlers for loaders.\\" into nyc-mr1-dev am: b6ee468b3e\" into nyc-mr1-dev-plus-aosp
am: 1134308842

Change-Id: I80459fe11f37ad937c5855d296a81b2d002370d2
2016-06-27 18:28:25 +00:00
Philip P. Moltmann
e6f1ddce89 Merge \"Do not remove handlers for loaders.\" into nyc-mr1-dev
am: b6ee468b3e

Change-Id: I5ad61204c45191fb60819bae717d5a3b6cc7947c
2016-06-27 18:23:11 +00:00
Philip P. Moltmann
b6ee468b3e Merge "Do not remove handlers for loaders." into nyc-mr1-dev 2016-06-27 18:12:12 +00:00
Phil Weaver
4192eac03a Merge "Behave if the same view gets a11y focus twice." 2016-06-27 17:42:56 +00:00
John Reck
25fb14537c Merge \\\"Add missing null checks\\\" into nyc-dev am: 02e391585d am: 0fc8707e2d
am: bffa989d28

Change-Id: If6fbfc645fefeaec6b82d97f82a7f50a1a0fee35
2016-06-27 17:17:19 +00:00
John Reck
bffa989d28 Merge \\"Add missing null checks\\" into nyc-dev am: 02e391585d
am: 0fc8707e2d

Change-Id: I9b8122c0a67be36b00cae06ce543a9de7aca8d40
2016-06-27 17:12:05 +00:00
John Reck
0fc8707e2d Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Idcba5c8393609034b70382844d499b45759b5e6d
2016-06-27 17:06:24 +00:00
John Reck
8a953d02d9 Merge \"Add missing null checks\" into nyc-dev
am: 02e391585d

Change-Id: Ib081c05d197b01ec3a9039941dd1265bf0b9b92c
2016-06-27 17:06:22 +00:00
Kirill Grouchnikov
3c242c3d25 Don't double-invoke scroll ended listener in animate*
Bug: 29754254
Change-Id: I8e7a997f93c83ddee4e923ca3990c4a8d9732c63
2016-06-27 12:10:31 -04:00
John Reck
474659ccc4 Add missing null checks
Bug: 29743482
Change-Id: Ic4bc5b9d5718eabd41e09a108a765b01aef4e3c8
2016-06-27 07:56:37 -07:00
Nicolas Prévot
56d8d05e8a Merge "Show policy transparency screen if adding an account is not allowed." 2016-06-27 14:45:35 +00:00
Ricky Wai
604582b6a3 Hide superfluous \\'Android system\\' header in Quite mode dialog am: 7f1ca4fe67
am: 1481cd53bf

Change-Id: Ic62f9dcf3d36865c9f584e34231c8bdb6b3801b3
2016-06-27 14:31:19 +00:00