Commit Graph

66612 Commits

Author SHA1 Message Date
Seigo Nonaka
d6acdcee26 Merge \"Treat U+2695, U+2640, U+2642 as emoji characters.\" into nyc-mr1-dev
am: c0ab2e83ac

Change-Id: Iaa4d63c425f5d263d322d463c320312890588aaf
2016-07-14 22:37:53 +00:00
Seigo Nonaka
dc8ad8d49d Merge \"Delete gender-balanced emoji sequence by one backspace key event.\" into nyc-mr1-dev
am: ef9e2a5f4b

Change-Id: If60a0502875163ec60eeac61a3195e217b34e9f5
2016-07-14 22:37:50 +00:00
Raph Levien
c0ab2e83ac Merge "Treat U+2695, U+2640, U+2642 as emoji characters." into nyc-mr1-dev 2016-07-14 22:25:40 +00:00
Raph Levien
ef9e2a5f4b Merge "Delete gender-balanced emoji sequence by one backspace key event." into nyc-mr1-dev 2016-07-14 22:25:21 +00:00
Jeff Sharkey
aa8ae41aa5 Merge \"Require permission for FLAG_WILL_BE_FOREGROUND.\" into nyc-mr1-dev
am: 97639a1310

Change-Id: I90756b855879cf37bc0bca86844fe99f8a62ef25
2016-07-14 20:14:31 +00:00
TreeHugger Robot
97639a1310 Merge "Require permission for FLAG_WILL_BE_FOREGROUND." into nyc-mr1-dev 2016-07-14 20:05:39 +00:00
Justin Klaassen
5f3bf63121 Merge \"Refactor display color transforms\" into nyc-mr1-dev
am: 94673f0b7c

Change-Id: I7fdf83db6cbf26cdc5b8a9971fa48b7f8458474d
2016-07-14 19:33:35 +00:00
Felipe Leme
6806690f8d Merge \\"Fixed statuses on Battery Saver column.\\" into nyc-dev am: 24b2e7bbee
am: 28318faf16

Change-Id: Id23c8c2af5ce170f00cf1d3968c56a59d5f168fb
2016-07-14 18:30:34 +00:00
Justin Klaassen
22eb19939d Refactor display color transforms
- Removed Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX, it's not desirable
  to persist the actual color transformation matrix.
- Refactored all SurfaceFlinger transforms to DisplayTransformManager,
  which allows color transforms to be set independently from the a11y
  manager service.

Bug: 30042357
Change-Id: Iefa477dedb66aac90e1218e327802a3fab6899ed
2016-07-14 11:28:07 -07:00
Felipe Leme
28318faf16 Merge \"Fixed statuses on Battery Saver column.\" into nyc-dev
am: 24b2e7bbee

Change-Id: I6b871cebf05f0fe18b054df456aabd80b10336aa
2016-07-14 18:23:12 +00:00
Felipe Leme
24b2e7bbee Merge "Fixed statuses on Battery Saver column." into nyc-dev 2016-07-14 18:10:56 +00:00
Felipe Leme
9e325706f4 Fixed statuses on Battery Saver column.
BUG: 30139400

Change-Id: I1798607af13c9be5e1f21212fd7078f7152562bd
2016-07-14 11:04:49 -07:00
Jeff Sharkey
785f494e87 Require permission for FLAG_WILL_BE_FOREGROUND.
We caught scheduleAsPackage(), but not schedule(), oops.

Bug: 28998999
Change-Id: I0642c2265ff61eead8747cc6b4d0f852f1ca3ef2
2016-07-14 10:43:14 -06:00
Rubin Xu
3ad94d299d Merge \"Fix typo in DevicePolicyManager\" into nyc-mr1-dev
am: 74eb4a5226

Change-Id: I790597626c960f2e9cb3ffcac20f77fc2e001075
2016-07-14 09:55:48 +00:00
Rubin Xu
74eb4a5226 Merge "Fix typo in DevicePolicyManager" into nyc-mr1-dev 2016-07-14 09:46:23 +00:00
Chris Banes
54224d40f9 Merge \"Read translation and elevation attributes as floats\" into nyc-mr1-dev
am: 6487312544

Change-Id: I22bdfa3abbc85ffb8de7bef62fae0e2e68e2368a
2016-07-14 09:21:17 +00:00
Chris Banes
6487312544 Merge "Read translation and elevation attributes as floats" into nyc-mr1-dev 2016-07-14 09:11:05 +00:00
Calin Juravle
5a7be749f7 Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
am: 7366e8c16a

Change-Id: I4f54b1b9c45294b2c3c43e0027ece1e8b38e335f
2016-07-14 08:39:22 +00:00
Nicolas Geoffray
7366e8c16a Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
* changes:
  [RFC] Special case system apps for profile optimizations
  Compile core-apps according to their own "reason" for A/B
2016-07-14 08:32:52 +00:00
Calin Juravle
0bd7762079 [RFC] Special case system apps for profile optimizations
If the OTA updates a system app which was previously preopted to a non-
preopted state the app might end up being verified at runtime. That's
because by default the apps are verify-profile but for preopted apps
there's no profile.

Do a hacky check to ensure that if we have no profiles (a reasonable
indication that before the OTA the app was preopted) system apps get
compiled with a non-profile filter (by default interpret-only).

Bug: 30032273
Test: Andreas "has verified that Calin's change to A/B works as expected
and promotes things like SystemUI to speed. From my side, that's
ready to be merged"

Change-Id: I7a052a8ea76cab7f649dc993237ea05534d6c4b9
2016-07-14 08:20:29 +00:00
Tomasz Mikolajewski
0f2a7ca01e Merge \"Fix javadoc broken links in DocumentsContract.\" into nyc-mr1-dev
am: 0e7bb571fd

Change-Id: I45a178f0897fd837307131007529286ca4af0025
2016-07-14 03:21:51 +00:00
Tomasz Mikolajewski
0e7bb571fd Merge "Fix javadoc broken links in DocumentsContract." into nyc-mr1-dev 2016-07-14 03:16:42 +00:00
Android Build Merger (Role)
36c6cf1bdc Merge "Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am: a7ebd4f4bb" into nyc-mr1-dev-plus-aosp 2016-07-14 01:59:25 +00:00
Selim Cinek
46aeea5dc1 Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
am: a7ebd4f4bb

Change-Id: Id3ffe5addb5e036eeda993d8dd6603b88c785804
2016-07-14 01:58:52 +00:00
Adam Lesinski
3d53abec7d Merge \\"Don\\'t hold on to AssetManager instances\\" into nyc-dev am: f8e99e72e7
am: 165e9d92b2

Change-Id: I184f3508fd602409d01f105500693b5d02ab37a3
2016-07-14 01:57:52 +00:00
Adam Lesinski
165e9d92b2 Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: Id29ae90fd336657d428a15fa0730b95d717386db
2016-07-14 01:50:52 +00:00
Adam Lesinski
ce9cf64eb3 Merge \"Don\'t hold on to AssetManager instances\" into nyc-dev
am: f8e99e72e7

Change-Id: I71b7499c6399ecbf1d8e8d93bf410aabbb2a1044
2016-07-14 01:50:52 +00:00
TreeHugger Robot
a7ebd4f4bb Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev
* changes:
  Fixed a bug where the headsup would be stuck disappearing
  Changed the appearance of phone call notifications
2016-07-14 01:38:53 +00:00
Phil Weaver
35dc926772 Merge \"Behave if the same view gets a11y focus twice.\" into nyc-mr1-dev
am: 93d51af336

Change-Id: I7ea7779f5f8735d6c10743eb3e7199b5a1d6c85d
2016-07-14 01:31:25 +00:00
Phil Weaver
93d51af336 Merge "Behave if the same view gets a11y focus twice." into nyc-mr1-dev 2016-07-14 01:25:05 +00:00
Adam Lesinski
e60064ab3c Don't hold on to AssetManager instances
If we enter multi-window mode or load WebView
assets into a Resources object, then the underlying
AssetManager instance may change.

crbug.com/627586

Bug:30118654

Change-Id: I837637bdad5370809db7f060d7d8536b536cad9e
2016-07-14 00:22:12 +00:00
Wei Liu
05c2c22a80 Merge \"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\" into nyc-mr1-dev
am: 6e8630307a

Change-Id: I7e381d5d62f9c79b0c604518ff6ea2d1d9c38dc4
2016-07-14 00:08:07 +00:00
Wei Liu
6e8630307a Merge "Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting." into nyc-mr1-dev 2016-07-13 23:59:28 +00:00
Ashutosh Joshi
d9a081e27a Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev
am: 2e42020eab

Change-Id: Ie2899e0eb301fd33ca2546fe854a5109a24906b2
2016-07-13 23:25:48 +00:00
Wei Jia
3ed59e2fda Merge \"MediaPlayer: fix typo for OnInfoListener.\" into nyc-mr1-dev
am: ebc3c9ca3f

Change-Id: I768ec161cc5350d6014127269c9b1f0901a1a923
2016-07-13 23:15:10 +00:00
Ashutosh Joshi
2e42020eab Merge "Add state for loading/unloading apps" into nyc-mr1-dev 2016-07-13 23:04:47 +00:00
Ashutosh Joshi
54787a5f9f Add state for loading/unloading apps
Add state for loading/unloading nanoApps.
Pass on OS response to ContextHubService clients.
Fix Build Breakage due to uninitalized variables.

Bug: 29193948
Change-Id: Ibebecf704bb3ad2583e110f1fcf05400a53b1b4c
2016-07-13 15:28:16 -07:00
Ashutosh Joshi
ebc3c9ca3f Merge "Revert "Add state for loading/unloading apps"" into nyc-mr1-dev 2016-07-13 22:17:37 +00:00
Ashutosh Joshi
f6029bbbcf Revert "Add state for loading/unloading apps"
This reverts commit 00b351aeef.

Change-Id: Iee229adff8fec4f2407aa895886e63953f0d7d32
2016-07-13 22:15:19 +00:00
Ashutosh Joshi
f4ba21c420 Merge \"Add state for loading/unloading apps\" into nyc-mr1-dev
am: a980cba4d8

Change-Id: I49333eb66bf8846e370b94b3c0c10c72664b5b2b
2016-07-13 21:57:29 +00:00
Selim Cinek
06e9e1fe00 Changed the appearance of phone call notifications
Change-Id: Ibf8f9b266428fdd5374ee824ec4c2df10daeb9a7
Fixes:28269355
2016-07-13 14:56:05 -07:00
Ashutosh Joshi
a980cba4d8 Merge "Add state for loading/unloading apps" into nyc-mr1-dev 2016-07-13 21:51:32 +00:00
Adrian Roos
f1d5c81aa0 Merge \"ApplicationErrorReport: Sanitize stack trace\" into nyc-mr1-dev
am: a07af1ee35

Change-Id: I26689370456dd424474683fca95950bd229bbe73
2016-07-13 21:39:59 +00:00
Adrian Roos
a07af1ee35 Merge "ApplicationErrorReport: Sanitize stack trace" into nyc-mr1-dev 2016-07-13 21:34:19 +00:00
Phil Weaver
0aaf427550 Behave if the same view gets a11y focus twice.
In some corner cases, ViewRootImpl#setAccessibilityFocus
can be called twice for the same view. Make sure we're
actually changing views before clearing accessibility focus
to avoid inconsistent state.

Bug: 29637593
Change-Id: I5dc6f05bdeaec55c352417bfca92c11bd03c3c10
(cherry picked from commit da4692774c)
2016-07-13 21:26:16 +00:00
Seigo Nonaka
3c7a0a0af4 Treat U+2695, U+2640, U+2642 as emoji characters.
Bug: 29885295
Change-Id: If187a08574b86ab775b0a4594d21bc9e26f84e2f
(cherry picked from commit beb21afc2e)
2016-07-13 21:10:56 +00:00
Seigo Nonaka
f20ca2cb15 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
(cherry picked from commit bba8d97c36)
2016-07-13 21:08:10 +00:00
Makoto Onuki
a74fce83ae Merge \"Revert \"Revert \"Revert \"Handle package broadcasts before apps do\"\"\"\" into nyc-mr1-dev
am: 6eefe67b2c

Change-Id: I514fb0b48c79644f7bc3154b3a18fabfc4c35d15
2016-07-13 20:21:56 +00:00
Makoto Onuki
6eefe67b2c Merge "Revert "Revert "Revert "Handle package broadcasts before apps do"""" into nyc-mr1-dev 2016-07-13 20:13:53 +00:00
Chong Zhang
12fad318b1 Merge \"Revert changes to force layout after insets changes\" into nyc-mr1-dev
am: 185131442b

Change-Id: I7d3eaa1d0337c0ae62ee24169b76f1938b8b9e68
2016-07-13 19:44:37 +00:00