Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
265,632 Commits 3 Branches 0 Tags
21aafa2b29984d9f36ddb06be4911ac2146de4b9
Commit Graph

61139 Commits

Author SHA1 Message Date
Christopher Tate
21aafa2b29 Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666 am: 494529318a 
am: 09c17150f9

* commit '09c17150f95dfdde2d737049dcecb3b04a160db5':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I77e998c444e5cd92422b9e176f5c9aea8526e6ce
 2016-05-31 23:25:01 +00:00
Jorim Jaggi
09c17150f9 Merge "Enforce background fallback to be non-translucent" into nyc-dev am: a35724f666 
am: 494529318a

* commit '494529318a0a8952ed5dc7bc00786f74f39b2612':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: I23fef9e69fb5aa0ec57d32e19d1fc513611018fd
 2016-05-31 23:17:32 +00:00
Christopher Tate
494529318a Merge "Don\'t bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev 
am: cd0aa9cda8

* commit 'cd0aa9cda8e57c224b473198a345fb008fe30b5a':
  Don't bother with WeakHashMap for direct alarm bookkeeping

Change-Id: Ia86b5f27d511bb8da2bd8982ffe35d4d2906da54
 2016-05-31 23:13:31 +00:00
Chris Tate
cd0aa9cda8 Merge "Don't bother with WeakHashMap for direct alarm bookkeeping" into nyc-dev 2016-05-31 22:59:26 +00:00
Christopher Tate
09d7d8f674 Don't bother with WeakHashMap for direct alarm bookkeeping 
Call cancel() explicitly before dropping local references to your
callback objects; they won't just quietly go away.

Bug 28987260

Change-Id: Id9da66ed86a46b4fb38127e2ddd7a7d84fd2313a
 2016-05-31 15:19:47 -07:00
George Mount
51e79e4452 Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7cbb am: 27a0e5a632 
am: cf653fa891

* commit 'cf653fa891078fe95af515a0cc8aba4e785919f0':
  Better handling of confused finish transition.

Change-Id: Iec8aa21cd416b69399e60de43e11029dcfb7f272
 2016-05-31 21:46:06 +00:00
George Mount
cf653fa891 Merge "Better handling of confused finish transition." into nyc-dev am: 2fd9cd7cbb 
am: 27a0e5a632

* commit '27a0e5a6323cd8712c34f6da9bacbecd6f6b51f8':
  Better handling of confused finish transition.

Change-Id: I0da6175da030570bd26117f1cd1e33a7ddf2c51d
 2016-05-31 21:42:16 +00:00
George Mount
eb18c0fa69 Merge "Better handling of confused finish transition." into nyc-dev 
am: 2fd9cd7cbb

* commit '2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
  Better handling of confused finish transition.

Change-Id: I0b43e01df97b98a7b646999999611c7aafbea33a
 2016-05-31 21:38:07 +00:00
George Mount
27a0e5a632 Merge "Better handling of confused finish transition." into nyc-dev 
am: 2fd9cd7cbb

* commit '2fd9cd7cbb7a792d041d0e0780b11b12b4591a90':
  Better handling of confused finish transition.

Change-Id: I27914d6161ab68ce236b9d15e5d07c71889edb4e
 2016-05-31 21:37:51 +00:00
TreeHugger Robot
2fd9cd7cbb Merge "Better handling of confused finish transition." into nyc-dev 2016-05-31 21:31:31 +00:00
George Mount
5ae0b7abf0 Better handling of confused finish transition. 
Bug 28347277

When an activity calls startActivity with makeSceneTransitionAnimation
and then calls finishAfterTransition, it should not do any transition
and just finish.

Change-Id: I00e537638fa6f24c95605f09bbafd843b569bb4d
 2016-05-31 12:58:52 -07:00
Selim Cinek
5651fb55be Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 80b8e67a99 
am: 01d7ef6909

* commit '01d7ef69092dc73ea878911efb4a0199de4f6a75':
  Fixed a few accessibility issues with notifications and groups

Change-Id: Ifcb87972b511760726ac634b4499478d56cb0e34
 2016-05-31 19:54:41 +00:00
Yigit Boyar
a71a70335d Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 am: 1968ffe284 
am: cd44c1631f

* commit 'cd44c1631ffdcb37c0b96d07fa1ed268d67c94a0':
  Invalidate child bounds when AbsListView bounds change

Change-Id: I32e6b83700ca9ba9799a1bd4349f2ca2d44b8e61
 2016-05-31 19:51:29 +00:00
Yigit Boyar
01d7ef6909 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 
am: 80b8e67a99

* commit '80b8e67a991c7992dfa25c0f280f5593ade3f2c5':
  Fixed a few accessibility issues with notifications and groups

Change-Id: Ica5eb674e8c12a633c86c3cfb6620bed08fae117
 2016-05-31 19:39:47 +00:00
Selim Cinek
f874020399 Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev 
am: ddc6de1eda

* commit 'ddc6de1eda495790e6564438994df5d49ddf248f':
  Fixed a few accessibility issues with notifications and groups

Change-Id: Iaa2ddc8bedaad3623190e65116f0d8b85687eb78
 2016-05-31 19:36:27 +00:00
Selim Cinek
80b8e67a99 Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev 
am: ddc6de1eda

* commit 'ddc6de1eda495790e6564438994df5d49ddf248f':
  Fixed a few accessibility issues with notifications and groups

Change-Id: Ieec9526a2c54edd2f0d3b34973cc61f610f452ae
 2016-05-31 19:36:21 +00:00
Yigit Boyar
cd44c1631f Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev am: bb039d2f17 
am: 1968ffe284

* commit '1968ffe2845b5a98ff9f3bc9bf549d9db981e5ad':
  Invalidate child bounds when AbsListView bounds change

Change-Id: I77dccc2452243bba6461e5adc80e703b1b1755b4
 2016-05-31 19:34:05 +00:00
Selim Cinek
ddc6de1eda Merge "Fixed a few accessibility issues with notifications and groups" into nyc-dev 2016-05-31 19:26:16 +00:00
Yigit Boyar
1968ffe284 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev 
am: bb039d2f17

* commit 'bb039d2f17d61b96c88d2cae445a53a642fb421f':
  Invalidate child bounds when AbsListView bounds change

Change-Id: I5d139388bea3610d2e1de2ded48ae7a510d2aba7
 2016-05-31 19:26:11 +00:00
Yigit Boyar
8e5e136403 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev 
am: bb039d2f17

* commit 'bb039d2f17d61b96c88d2cae445a53a642fb421f':
  Invalidate child bounds when AbsListView bounds change

Change-Id: I204f80216fb0594b7c7cb6070add58e91003b7a7
 2016-05-31 19:26:09 +00:00
Yigit Boyar
bb039d2f17 Merge "Invalidate child bounds when AbsListView bounds change" into nyc-dev 2016-05-31 19:20:21 +00:00
Alan Viverette
80bf1f8a3c Remove framework dependencies on Support* demos 
Change-Id: I5b3ba0e7a17ee5ccd93e97b3bd9c519cb8641d97
 2016-05-31 14:00:45 -04:00
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
Nicolas Geoffray
ff078da846 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 
am: 89f4bff149

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

Change-Id: Id973c65cbe87f54a743bfcb89fbe7e4aea45d1c8
 2016-05-31 11:36:34 +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
Selim Cinek
ddf1b399d8 Fixed a few accessibility issues with notifications and groups 
Change-Id: I78fa62884eaa0efe825b5eb1e6cac7d88fc05a7f
Fixes: 28069681
 2016-05-27 17:04:56 -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