Commit Graph

67114 Commits

Author SHA1 Message Date
Nicolas Geoffray
f95fb4fb17 resolve merge conflicts of 4b092e4 to master
Change-Id: I29a92ce3afe3a7b2851126a921879631e9846a40
2016-05-31 13:35:41 +01:00
Nicolas Geoffray
4b092e47ac Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149
am: 0063f2c80b

* commit '0063f2c80b1d9512fd77ca71faa85737c1fd2424':
  Cleanup performDexOpt with instruction sets.

Change-Id: If15ee5ff3e58d3bf0226bea94707e228c77fbf08
2016-05-31 11:53:00 +00:00
Nicolas Geoffray
0063f2c80b Merge "Cleanup performDexOpt with instruction sets." into nyc-dev
am: 89f4bff149

* commit '89f4bff149c62baf8371118aed2c4e6ac29976c5':
  Cleanup performDexOpt with instruction sets.

Change-Id: I6293cb0c9adf562d69aac59d74edc6540e6a0693
2016-05-31 11:36:37 +00:00
TreeHugger Robot
89f4bff149 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 2016-05-31 11:23:44 +00:00
Roozbeh Pournader
08b6d01ccb Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
am: fe524c0e24

* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: I98301daa256ab8e8dc2dc05c1e877f39ef685c23
2016-05-31 04:49:59 +00:00
Roozbeh Pournader
a0b920f4da Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 am: 5f55e2c43d
am: bbed32a63b

* commit 'bbed32a63b420126850767ae5cf2484bea11c1d4':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: Ibead4334a7797320d6ae7c5792482416b4a7e2d0
2016-05-31 01:32:39 +00:00
Roozbeh Pournader
bbed32a63b Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24
am: 5f55e2c43d

* commit '5f55e2c43d8fa1f8b494a5457106435b519bb8c4':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: Icadb45317257e80e97c4dad6970310f64abb1f0b
2016-05-31 01:26:35 +00:00
Roozbeh Pournader
5f55e2c43d Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev
am: fe524c0e24

* commit 'fe524c0e24ba2dc65c9ea490b2334a039c1b0a6a':
  Support ellipsizing LocaleHelper.getDisplayLocaleList()

Change-Id: Ifc5d3f3b43bef256141db089d5783427561e4dae
2016-05-31 01:20:44 +00:00
Roozbeh Pournader
fe524c0e24 Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev 2016-05-31 01:02:42 +00:00
Christopher Tate
b787a5cb6b Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757 am: 8cc9f36067
am: 6d31571950

* commit '6d315719501341621d8d7f67a2b1dd70981c4d36':
  Don't call .toString() on potentially null CharSequence

Change-Id: I22099d2d55539af4ed13d4121296402b9596f631
2016-05-28 01:11:57 +00:00
Chris Tate
6d31571950 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev am: b182735757
am: 8cc9f36067

* commit '8cc9f360673ac971050d03b384a78cd2163454bc':
  Don't call .toString() on potentially null CharSequence

Change-Id: Ia30a5de830ceacf310e1573f55c206d40a679db7
2016-05-28 01:04:37 +00:00
Doris Liu
b37b27ff19 Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev am: d01f474773
am: d38541009b

* commit 'd38541009b847cba108a71a49d64d809b0bb5f42':
  Add more doc for Object animators defined with a single value

Change-Id: Icbc5a547c8a586335d4a826059765103cb59f26f
2016-05-28 01:00:20 +00:00
Christopher Tate
7317034daf Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I5c8253739fa06b07abd4d67b4947c6bed153d010
2016-05-28 00:57:43 +00:00
Christopher Tate
8cc9f36067 Merge "Don\'t call .toString() on potentially null CharSequence" into nyc-dev
am: b182735757

* commit 'b182735757630db7e84e577c999b9e7d8a288353':
  Don't call .toString() on potentially null CharSequence

Change-Id: I7242f7f064f6695956a9b529f38c2ece82effbcb
2016-05-28 00:57:39 +00:00
Chris Tate
b182735757 Merge "Don't call .toString() on potentially null CharSequence" into nyc-dev 2016-05-28 00:52:11 +00:00
Adrian Roos
f8bddb4840 Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674 am: d70126ec78
am: c67191508b

* commit 'c67191508bb0ab195696fedd3e173c9b37488084':
  Fix bad one-line MessagingStyle

Change-Id: I96b15a9c1121f8c9be257722380ded5235bd5a93
2016-05-28 00:32:56 +00:00
Makoto Onuki
53da7b9ee3 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev am: 5b11a81f9f
am: 451afea589

* commit '451afea5892454be029910b18a73d27bf41ad5bd':
  ShortcutManager: Implement get-drawable APIs

Change-Id: I6f72f51bbfed601c3ab087921e8de9a64ad785ee
2016-05-28 00:26:15 +00:00
Christopher Tate
f135b271bf Don't call .toString() on potentially null CharSequence
We're building an exception message string, but by explicitly invoking
.toString() we're accidentally triggering an NPE rather than the typed
exception we want to throw.  Build the string in a way that will be
safe and sensical even if the CharSequence is null.

Bug 29009255

Change-Id: I1813260f0b36fd44506b8327f997dd20c2d6c8bf
2016-05-27 17:13:10 -07:00
Doris Liu
d38541009b Merge "Merge "Add more doc for Object animators defined with a single value" into nyc-dev am: f97a0f5c9c" into nyc-mr1-dev
am: d01f474773

* commit 'd01f474773792241fd67a98bc0a946ec4409be80':
  Add more doc for Object animators defined with a single value

Change-Id: I0f8db3135b7795d8ce40c7d78ce8d9180d3f3b1d
2016-05-28 00:01:39 +00:00
Doris Liu
cf9df710e5 Merge "Add more doc for Object animators defined with a single value" into nyc-dev
am: f97a0f5c9c

* commit 'f97a0f5c9c501bc7e39c779ebb2e009e1ea496cd':
  Add more doc for Object animators defined with a single value

Change-Id: I1be74292a21b0b9d86dd2df35c319f3a2f4a230c
2016-05-27 23:56:51 +00:00
Doris Liu
55455b2da3 Merge "Add more doc for Object animators defined with a single value" into nyc-dev
am: f97a0f5c9c

* commit 'f97a0f5c9c501bc7e39c779ebb2e009e1ea496cd':
  Add more doc for Object animators defined with a single value

Change-Id: I14cfe5e0a80832b57a270b5b34164d7e4232feeb
2016-05-27 23:56:47 +00:00
TreeHugger Robot
f97a0f5c9c Merge "Add more doc for Object animators defined with a single value" into nyc-dev 2016-05-27 23:51:18 +00:00
Jorim Jaggi
62538ce113 Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c am: 819cbb3dd3
am: bdcfbf442b

* commit 'bdcfbf442b8a8f46ece20cd9048430532cadcca4':
  Close IME when attaching dock stack

Change-Id: Id8ad2640a632f7d53f9f5ec175542fff4d3d7127
2016-05-27 23:51:03 +00:00
Felipe Leme
6afa2e1d1d Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860 am: 8c8ea506d9
am: d786355405

* commit 'd786355405dfb50b1e6eb0bb8628276b9b2823c6':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ic8f6cbfce572c54d7124a508af12043a58d5bc66
2016-05-27 23:43:14 +00:00
Amith Yamasani
8adc553b3e Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev am: 5df14a60cf
am: df2297dcf3

* commit 'df2297dcf3b3a923207d1598dc4f6af0c1759241':
  Helper method to check if current user is a demo user

Change-Id: I8149210498462036659c1b6b8e8dd322e6dfa336
2016-05-27 23:43:10 +00:00
Siyamed Sinir
06ce394edc Merge "Revert "Fix TextView layout reuse when maxLines is set"" into nyc-dev am: 990e26118d am: 6fe1ab7f21
am: af57bd751f

* commit 'af57bd751f9402a54db3cb60dd7c93a8106ae2b0':
  Revert "Fix TextView layout reuse when maxLines is set"

Change-Id: I6c4865dceff4debb17e679a67ffbb3d7eb33f817
2016-05-27 23:40:53 +00:00
Siyamed Sinir
686e0545c7 Merge "Set StaticLayout.maxLines only when ellipsize is set" into nyc-dev am: 92d0316d28 am: 361f03c4e2
am: 3e7177f91f

* commit '3e7177f91f7e7097dcc4f6613c8baf7fff5a333e':
  Set StaticLayout.maxLines only when ellipsize is set

Change-Id: Ic21d60a789a0361ffca8362621fa03ded8d96ae5
2016-05-27 23:40:05 +00:00
Amith Yamasani
69c76ce387 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev am: aabbfc5565
am: a3bc135bb4

* commit 'a3bc135bb413bb159847926e0ccdf99acf125360':
  Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""

Change-Id: Ifa8f6f8e195bca93af058914c5b1797f3294df6e
2016-05-27 23:35:36 +00:00
Adrian Roos
c67191508b Merge "Fix bad one-line MessagingStyle" into nyc-dev am: 5dbb9ff674
am: d70126ec78

* commit 'd70126ec780a30d18e65b70c3dcc29f7253352e3':
  Fix bad one-line MessagingStyle

Change-Id: Iba2e4bb6be2dcb6e1800b8863046084a3540a0f2
2016-05-27 23:18:42 +00:00
Adrian Roos
7d4da18d03 Merge "Fix IME and NavBar overlap with Direct Reply" into nyc-dev
am: 5dbb9ff674

* commit '5dbb9ff67468979214542eb6a448711d2d614cdb':
  Fix bad one-line MessagingStyle

Change-Id: I1b6cf5033b970aea74fed1ac07c93fe69b7fb1de
2016-05-27 23:12:29 +00:00
Makoto Onuki
09c6612288 resolve merge conflicts of 8de7c95 to master
Change-Id: I04447215323c7582554dc5f6ae8b105308c6f623
2016-05-27 16:10:34 -07:00
Ruchi Kandoi
3dc9df699b Merge "PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()" into nyc-dev am: 7730e57dc6 am: e9f42318f6
am: fcb3aa4a68

* commit 'fcb3aa4a681021c95f55673f18141502667320e3':
  PowerManager: Adds Documentation to isSustainedPerformanceModeSupported()

Change-Id: I2acde231a58d82ea15a20757dbf3bac8f9edbba6
2016-05-27 22:53:48 +00:00
Alan Viverette
e40e318b4f Merge "resolve merge conflicts of f118700 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp am: 9ab249bef2
am: 32148220f7

* commit '32148220f7e31ca100fad42c31841159aa639be4':
  Chronometer: Update the value only if displayed on screen

Change-Id: Icf53d90ea83f54457b77bec28291efe92b4c1c88
2016-05-27 22:53:45 +00:00
Makoto Onuki
451afea589 Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev
am: 5b11a81f9f

* commit '5b11a81f9fed69b0b6e233bad4ba8636f47febf7':
  ShortcutManager: Implement get-drawable APIs

Change-Id: If0c3279fe7374382a2f7148435b009c02e7d7e88
2016-05-27 22:52:43 +00:00
Makoto Onuki
5b11a81f9f Merge "ShortcutManager: Implement get-drawable APIs" into nyc-mr1-dev 2016-05-27 22:48:33 +00:00
Adam Lesinski
ddacd0f779 Merge "Merge "Fix issue where max idle time > total idle time" into nyc-dev am: 89046edb4d am: fc7c27b215" into nyc-mr1-dev-plus-aosp
am: 0c67994e33

* commit '0c67994e33f0c5ae471a83129cf8b7ec9eb54ef7':
  Fix issue where max idle time > total idle time

Change-Id: Ia9cf5c89afc542f14ac3ca664e8a2baa0f3d1218
2016-05-27 22:13:57 +00:00
Doris Liu
3c85983996 Add more doc for Object animators defined with a single value
Bug: 28104516
Change-Id: I181b2817ceda5dfaf87e12c81b21e7d0d2f002fc
2016-05-27 15:08:46 -07:00
Adrian Roos
d70126ec78 Merge "Fix bad one-line MessagingStyle" into nyc-dev
am: 5dbb9ff674

* commit '5dbb9ff67468979214542eb6a448711d2d614cdb':
  Fix bad one-line MessagingStyle

Change-Id: I3dd2c32f3fee1e61d63da8903ae468d9e8da19c0
2016-05-27 22:08:06 +00:00
Adrian Roos
5dbb9ff674 Merge "Fix bad one-line MessagingStyle" into nyc-dev 2016-05-27 22:02:38 +00:00
Bart Sears
63a75e3b89 Revert "Remove ActivityManager calls with PM.mInstallLock held"
This reverts commit ac06a4907b.

Change-Id: I27bedbd221a8d416b9040a96063e66a1ca69fe2e
2016-05-27 21:28:50 +00:00
Jorim Jaggi
bdcfbf442b Merge "Close IME when attaching dock stack" into nyc-dev am: c5fc6c602c
am: 819cbb3dd3

* commit '819cbb3dd32bb0c721b4fef427f4ed84e208b15a':
  Close IME when attaching dock stack

Change-Id: I31b42a8f971f74e11febe9635fa6489924914226
2016-05-27 21:20:58 +00:00
Jorim Jaggi
26dea2d518 Merge "Close IME when attaching dock stack" into nyc-dev
am: c5fc6c602c

* commit 'c5fc6c602c16f0e985d8f8ba7f94075229e52320':
  Close IME when attaching dock stack

Change-Id: I40abf80fcea522c8082e622c33f3a6726f781145
2016-05-27 21:15:26 +00:00
Jorim Jaggi
819cbb3dd3 Merge "Close IME when attaching dock stack" into nyc-dev
am: c5fc6c602c

* commit 'c5fc6c602c16f0e985d8f8ba7f94075229e52320':
  Close IME when attaching dock stack

Change-Id: I7921bf88bb49134d1fbde752d5fa963786ec1d46
2016-05-27 21:15:22 +00:00
Jorim Jaggi
3c5d0f1041 Close IME when attaching dock stack
So we don't end up with animation weirdness.

Bug: 28905720
Change-Id: I04124995dd99fa26d2e9be467c5976d7b20810a7
2016-05-27 21:08:39 +00:00
Felipe Leme
d786355405 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a860
am: 8c8ea506d9

* commit '8c8ea506d91db44de1d312612a8f63ab107af799':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Iaffe5981b299eca5756666bd03c67a84c8e15283
2016-05-27 20:08:59 +00:00
The Android Automerger
6f2f02e4ae Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
  docs: Refinements for testing
  Fix toast with accessibility and app pinning
  Updated link to material design page.
  Change overdraw test to use windowbackground
  Prevent callbacks during DrawableContainer child initialization
  Fixing crash in SysUI due to invalid group.
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
  Fix Activity Transition mess-up.
  Time to #NameAndroidN!
  Prevent use of a null sCallbackObj by Hardware FLP
  Fixed the relative time spoken with accessibility
  Use backstop timeouts on asynchronous countdown during preflight
2016-05-27 20:05:56 +00:00
Felipe Leme
feaa8982fc Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: I11bf96280ac5e143d5260cb20238da38b4e0eaa3
2016-05-27 20:04:25 +00:00
Felipe Leme
8c8ea506d9 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev
am: efa291a860

* commit 'efa291a8605e91d775faf46ada349ec7f81fcdb9':
  Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent.

Change-Id: Ibd09b082140b66d25bd8583040761581bb20af76
2016-05-27 20:04:22 +00:00
TreeHugger Robot
efa291a860 Merge "Allow apps to bypass Power Save restrictions when launched from a Notification's PendingIntent." into nyc-dev 2016-05-27 19:58:24 +00:00
Amith Yamasani
df2297dcf3 Merge "Helper method to check if current user is a demo user" into nyc-mr1-dev
am: 5df14a60cf

* commit '5df14a60cf4eb5340d9339244ca7ba2485495531':
  Helper method to check if current user is a demo user

Change-Id: I94f08185ccbc3ce16add9279a584a3c739d03432
2016-05-27 19:32:35 +00:00