Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
274,225 Commits 3 Branches 0 Tags
c190813b938ecf28d9e76b07098e9637ced8808e
Commit Graph

68680 Commits

Author SHA1 Message Date
Vladislav Kaznacheev
7fe1f798bf Always return valid ClipDescription for ACTION_DRAG_EXITED 
Bug: 30148704
Change-Id: I5f5cbb35a343e6ef61bed9ff92e3921a4ecce0c0
 2016-07-14 17:15:02 -07:00
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
TreeHugger Robot
f9ad29f3e4 Merge "PopupWindow: Be more consistent about Gravity calculation." 2016-07-14 21:00:50 +00:00
Jeff Sharkey
96347802ce Merge \\"Require permission for FLAG_WILL_BE_FOREGROUND.\\" into nyc-mr1-dev am: 97639a1310 
am: aa8ae41aa5

Change-Id: Icfe17015febaa13823bf9c6d35c33a09d39e7462
 2016-07-14 20:22:54 +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
Justin Klaassen
290c38567e Merge \\"Refactor display color transforms\\" into nyc-mr1-dev am: 94673f0b7c 
am: 5f3bf63121

Change-Id: I06a60ef4a1fa23e0c1f5b6ab97462811b6aaf239
 2016-07-14 20:09:52 +00:00
Felipe Leme
c2d218caaf Merge \"Merge \\\"Fixed statuses on Battery Saver column.\\\" into nyc-dev am: 24b2e7bbee am: 28318faf16\" into nyc-mr1-dev-plus-aosp 
am: 4a9c54610e

Change-Id: Id346251c47c7d313eb652b809d088ffb82904d0e
 2016-07-14 20:07:08 +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
5b6e68fd41 Merge \\"Fix typo in DevicePolicyManager\\" into nyc-mr1-dev am: 74eb4a5226 
am: 3ad94d299d

Change-Id: I3cd6b39d0b979a07a7021dbaf6f7766ea9ebf7e2
 2016-07-14 10:05:46 +00: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
70ebe6dc10 Merge \\"Read translation and elevation attributes as floats\\" into nyc-mr1-dev am: 6487312544 
am: 54224d40f9

Change-Id: Iaa17584e9309b38fcaf81de62e9e3c13c94a1721
 2016-07-14 09:29:39 +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
Nicolas Geoffray
19e0f615ca Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev am: 7366e8c16a 
am: 5a7be749f7

Change-Id: Idb189d89f9cebcc6e9809e7f489c51baae5e8253
 2016-07-14 08:49:16 +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
af885e9fa2 Merge \\"Fix javadoc broken links in DocumentsContract.\\" into nyc-mr1-dev am: 0e7bb571fd 
am: 0f2a7ca01e

Change-Id: I219e199647533a22eecf9cb0cdf29057f37798e6
 2016-07-14 03:27:49 +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
Selim Cinek
7c2097fb1f Merge \"Merge changes I56d6be69,Ibf8f9b26 into nyc-mr1-dev am: a7ebd4f4bb\" into nyc-mr1-dev-plus-aosp 
am: 36c6cf1bdc

Change-Id: I5ecebb835b60f163ad1d6cdff41b30c5590eb8cc
 2016-07-14 02:06:34 +00:00
Adam Lesinski
c7502cc7b5 Merge \\\"Don\\\'t hold on to AssetManager instances\\\" into nyc-dev am: f8e99e72e7 am: 165e9d92b2 
am: 3d53abec7d

Change-Id: Ife9502a444f46d6327e08248833814bd2357d7a2
 2016-07-14 02:06:28 +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
Makoto Onuki
4e6cef49ef Handle locale change and pacakge change in different way 
- Stop using a custom callback from AM to detect locale changes
and use the LOCALE_CHANGED broadcast instead.

- This would open up a chance where a publisher app fetches
its won manifest shortcuts after a locale change but
ShortcutManager hasn't updated string resources.

- So instead, at every entry point from ShortcutManager, check
if the locale has changed, and if so, update all resources
(and reset throttling).

- Do the same for package change events too.  At every entry point
from ShortcutManager, check if the caller package has been updated,
or any target activities have been disabled.  If so, rescan the
caller package.

- We do *not* do the same check at the LauncherApps entry points,
because the launcher should use the callback to listen to
shortcut changes.

- Also stopped using PackageMonitor for now because we want to
set a higher priority and changing PackageMonitor at this point
seems too much for DR.

Bug 29895275
Bug 30123329

Change-Id: Ib4a2f626a936c7328e2cc032324f5c3d1c3b9122
 2016-07-13 17:37:06 -07: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
2cd9eb7c35 Merge \\"Add BUGREPORT_OPTION_WEAR so that Wear can customize its bugreporting.\\" into nyc-mr1-dev am: 6e8630307a 
am: 05c2c22a80

Change-Id: I8af1193d4af465f234c8ba08ff0eeefa7279e029
 2016-07-14 00:15:25 +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
5bcbe74198 Merge \"Merge \\"Add state for loading/unloading apps\\" into nyc-mr1-dev am: 2e42020eab\" into nyc-mr1-dev-plus-aosp 
am: 5c99851d23

Change-Id: I0f52f1406840b9ddcfe9dd30c19c5ea01755039f
 2016-07-13 23:46:22 +00:00
Ashutosh Joshi
0ce29c421e Merge \\"MediaPlayer: fix typo for OnInfoListener.\\" into nyc-mr1-dev am: ebc3c9ca3f 
am: 3ed59e2fda

Change-Id: Ib10558712b5e7abe1b0a853eceb4c20beacd6153
 2016-07-13 23:31:13 +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