Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,965 Commits 3 Branches 0 Tags
5fbd15c9606ff45ea596dedd08b4d32af612fcb3
Commit Graph

8134 Commits

Author SHA1 Message Date
Adrian Roos
b801527604 Merge "Merge "Notification MessagingStyle: Add handset views" into nyc-dev am: 4db2f1f" into nyc-dev-plus-aosp 
am: 34f82ca

* commit '34f82ca7332d2a148329128d773c328f5f48c3bc':
  Notification MessagingStyle: Add handset views

Change-Id: I3ca2689bd7de8fe13e6eca22bd562f7269801306
 2016-04-12 22:40:41 +00:00
Shreyas Basarge
cd001c26da Merge "Merge "Documentation for flex field" into nyc-dev am: 997743d" into nyc-dev-plus-aosp 
am: cbdbaad

* commit 'cbdbaadde6f9aaf5bd2cc016d3b4b1c9a5e16210':
  Documentation for flex field

Change-Id: Ic1faf3e0ed1f529cd579f83f65b9358b161331d2
 2016-04-12 22:38:49 +00:00
Adrian Roos
28d6762456 Merge "Notification MessagingStyle: Add handset views" into nyc-dev 
am: 4db2f1f

* commit '4db2f1f6020a82012bcd3141a22bd59e0baed1d5':
  Notification MessagingStyle: Add handset views

Change-Id: Ib1971c6c1d8aa07ef586073bf2316f2b3b18bfab
 2016-04-12 22:22:15 +00:00
Shreyas Basarge
8a71af509a Merge "Documentation for flex field" into nyc-dev 
am: 997743d

* commit '997743d29e46ed034a0769e765a5ce83cd3f903a':
  Documentation for flex field

Change-Id: I6ef9763ec0c6e333ddae002e6dcf4a66d862464e
 2016-04-12 22:21:00 +00:00
TreeHugger Robot
4db2f1f602 Merge "Notification MessagingStyle: Add handset views" into nyc-dev 2016-04-12 20:12:41 +00:00
Shreyas Basarge
997743d29e Merge "Documentation for flex field" into nyc-dev 2016-04-12 19:35:21 +00:00
Adrian Roos
c1a80b08f0 Notification MessagingStyle: Add handset views 
Bug: 27250207
Change-Id: I499cf2beaeeb34f0f189815fc0911f3b8954bd50
 2016-04-12 11:52:49 -07:00
Alexander Hills
d98785e288 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev am: e3f3cb1 
am: 0666069

* commit '06660697a3198835b5a7955f3955e58fb92e407f':
  Fixes name of intent launch flag for Action Extender

Change-Id: Ia824a1bc0a6c52697e0e0ce7cea0f6448ef60594
 2016-04-12 17:29:39 +00:00
Alex Hills
06660697a3 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 
am: e3f3cb1

* commit 'e3f3cb10484260fac167e59d0178902a63ea7a6b':
  Fixes name of intent launch flag for Action Extender

Change-Id: Idbfc4beca1067031b9a7608930aa61779644901e
 2016-04-12 17:24:10 +00:00
Alexander Hills
e3f3cb1048 Merge "Fixes name of intent launch flag for Action Extender" into nyc-dev 2016-04-12 17:10:19 +00:00
Alex Hills
4ec3ff4f8f Fixes name of intent launch flag for Action Extender 
Changes the name from set/getHintContentIntentLaunchesActivity
to set/getLaunchesActivty

Change-Id: I8ef879ae82cc360163fcd689eb5fad0d2b9d7db0
 2016-04-12 11:44:36 -04:00
Shreyas Basarge
9e6d588c93 Documentation for flex field 
Add documentation for getFlexMillis in JobInfo.

Bug: 27530396
Change-Id: I98319cd8ceb0ecd56ab3000bdd31d8bca1bacc3f
 2016-04-12 11:04:53 +01:00
Jeff Sharkey
3af69b89b3 Merge "Fix notifications that are sent for USER_ALL." into nyc-dev am: 01a1ad5 
am: 4ed2fb8

* commit '4ed2fb8b5cfe63087d155d1f4f2bbe0b8a312980':
  Fix notifications that are sent for USER_ALL.

Change-Id: Ifa2314c4f0f913f92f22fe02ff770912e307e913
 2016-04-11 23:30:46 +00:00
Makoto Onuki
1187239423 Merge "ShortcutManager: First cut of CTS" into nyc-dev am: bc20320 
am: 0beb56d

* commit '0beb56d4e49f433759f7c825374c90442f2aed53':
  ShortcutManager: First cut of CTS

Change-Id: I048150bf9451e8d28dc599673321bd31f8d119a1
 2016-04-11 23:30:43 +00:00
Jeff Sharkey
4ed2fb8b5c Merge "Fix notifications that are sent for USER_ALL." into nyc-dev 
am: 01a1ad5

* commit '01a1ad511e126aca0b445457f06e31f903b84ffb':
  Fix notifications that are sent for USER_ALL.

Change-Id: I73f0984bf8d298017577fbe20406a0f19996fed6
 2016-04-11 23:25:25 +00:00
Makoto Onuki
0beb56d4e4 Merge "ShortcutManager: First cut of CTS" into nyc-dev 
am: bc20320

* commit 'bc20320f7f224d1cc5be3c436a1a5ece2067f2ec':
  ShortcutManager: First cut of CTS

Change-Id: I23d24480870644cf69575d2f11bfc55056c0fb96
 2016-04-11 23:25:23 +00:00
Jeff Sharkey
01a1ad511e Merge "Fix notifications that are sent for USER_ALL." into nyc-dev 2016-04-11 23:19:07 +00:00
Jeff Sharkey
012bc7bb9f Fix notifications that are sent for USER_ALL. 
Also avoid creating a heavy LoadedApk object which will be cached
around in the long-lived system process.

Bug: 28116427
Change-Id: I1a5fc43e6d559a09088636b2fe4b5c76f08d3413
 2016-04-11 17:18:29 -06:00
Adam Powell
1629a08fb9 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev am: e60b8f8 
am: 701bb7a

* commit '701bb7ae13879764b316918042fe8118664d73af':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: Ia089ebf5b2ba924ceb8e57132ed5c89b7211b8a5
 2016-04-11 23:14:40 +00:00
Makoto Onuki
bc20320f7f Merge "ShortcutManager: First cut of CTS" into nyc-dev 2016-04-11 23:11:41 +00:00
Adam Powell
701bb7ae13 Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev 
am: e60b8f8

* commit 'e60b8f897065a9600058a7b958f1e0bcd198b0b5':
  Prevent duplicate loader onLoadFinished calls on config change

Change-Id: I93fd543a33d9a78f7dbbcadb3261b2e53fd8f2ba
 2016-04-11 23:09:36 +00:00
Makoto Onuki
5ba0d3e3a3 ShortcutManager: First cut of CTS 
Bug 27548047

Change-Id: Idd7a768ea4fee44c2cf6e3bd473cea9e67f5f7cd
 2016-04-11 14:48:44 -07:00
Adam Powell
eba13dd07f Prevent duplicate loader onLoadFinished calls on config change 
Loaders report entering the started state in two places, once from
their host callbacks and once when moving into their host fragment's
starting state. In the former, we will also deliver load results if
we're finishing a retained cycle.

In practice, the individual fragment start happens first which clears
the report-next-start flag, then the finishRetain step sees that flag
is cleared and dispatches the finished load results again. Change
reportStart to only call onLoadFinished if we are not finishing up a
retain step.

Bug 28074512

Change-Id: I85b848f7d7b239c8fac5aec8f0c91e4eea6bcebf
 2016-04-11 14:26:58 -07:00
Benjamin Franz
a53601c090 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev am: 3f7fdaa 
am: 9a9a9aa

* commit '9a9a9aa9b3b1e3e5d4f9214b2c2055a24b73fc65':
  Revert "Throw security exception for non-parent aware APIs"

Change-Id: I5a98eed59c136d3d5d26a239d1e90657737e9449
 2016-04-11 14:46:57 +00:00
Benjamin Franz
9a9a9aa9b3 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev 
am: 3f7fdaa

* commit '3f7fdaaa766104cc5b8946676c9187661cb60aa7':
  Revert "Throw security exception for non-parent aware APIs"

Change-Id: I2c4754cb70096372f2b04f1f52ecc2c93a5f8ae2
 2016-04-11 14:41:38 +00:00
Benjamin Franz
3f7fdaaa76 Merge "Revert "Throw security exception for non-parent aware APIs"" into nyc-dev 2016-04-11 14:32:49 +00:00
Benjamin Franz
a26c626564 Revert "Throw security exception for non-parent aware APIs" 
This reverts commit bd7ae782ed.

Bug: 28107853

Change-Id: Ic286d9a181e96b8eb9826dab9ed297e0e4dfa6de
 2016-04-11 12:43:17 +00:00
Clara Bayarri
c4e4274d9e Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev am: 738ab04 
am: 3f19243

* commit '3f192435a964c2c24073d1befe0c07e7eb37ff47':
  Expose the Keyboard Shortcuts Helper in Activity

Change-Id: Idaf11769a1fc78cb759ab1303a82ba1d354a3076
 2016-04-11 09:52:19 +00:00
Clara Bayarri
3f192435a9 Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev 
am: 738ab04

* commit '738ab04fd94746d47ebeffa97252b7e3fb2a8d93':
  Expose the Keyboard Shortcuts Helper in Activity

Change-Id: I94122c113dd2eb8b02f21563f50d898f89db5515
 2016-04-11 09:47:39 +00:00
Clara Bayarri
738ab04fd9 Merge "Expose the Keyboard Shortcuts Helper in Activity" into nyc-dev 2016-04-11 09:43:16 +00:00
Amith Yamasani
8528648384 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev am: 0cc0381 
am: 597965f

* commit '597965f5384b5f4f77ae4ef39e8db799529ab46d':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: Ida3e6c5ce407007955eb1533f13d6465e194937c
 2016-04-09 05:58:21 +00:00
Julia Reynolds
c54a7d7b76 Merge "Allow the ranker to autobundle notifications." into nyc-dev am: 3898db9 
am: af343d6

* commit 'af343d6796eb0996d134bd606b76b6b2ee5bb185':
  Allow the ranker to autobundle notifications.

Change-Id: I9b5011fa6261d8717db66c5786b51679188f6d8c
 2016-04-09 05:53:09 +00:00
Dianne Hackborn
15a3cde2a1 Merge "Fix issue #28075893: Don\'t hold strong refs on to JobService" into nyc-dev am: 6827db3 
am: 97907066

* commit '97907066c6cf19eb85607798a41a6f002fb4ea1a':
  Fix issue #28075893: Don't hold strong refs on to JobService

Change-Id: I44ac8048311da7e3ea274b532c25e150e2b044ce
 2016-04-09 05:50:53 +00:00
Andrii Kulian
04154a27ae Merge "Fix multiple configuration changes in multiwindow" into nyc-dev am: 21400cb 
am: d4b770e

* commit 'd4b770e16e875a8c6339c40d90dc27e2791e9631':
  Fix multiple configuration changes in multiwindow

Change-Id: I7c8b421a3437fca2a7dd82ab5cf46b8a0bc06831
 2016-04-09 05:49:24 +00:00
Amith Yamasani
597965f538 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev 
am: 0cc0381

* commit '0cc0381714f0356dd6cece201265b368fa2706b6':
  Improved javadoc for onLocalVoiceInteractionStopped

Change-Id: I81a9d06e3ce67859f32476f7a5c2c3b87e6f8d4f
 2016-04-09 01:43:20 +00:00
Amith Yamasani
0cc0381714 Merge "Improved javadoc for onLocalVoiceInteractionStopped" into nyc-dev 2016-04-09 00:47:23 +00:00
Julia Reynolds
af343d6796 Merge "Allow the ranker to autobundle notifications." into nyc-dev 
am: 3898db9

* commit '3898db9e152ff8e2b34ae97f4a2ed37b9cb667db':
  Allow the ranker to autobundle notifications.

Change-Id: I652a43365b8eee51e91ed1c5d22aacb1b488e373
 2016-04-09 00:41:35 +00:00
Dianne Hackborn
97907066c6 Merge "Fix issue #28075893: Don\'t hold strong refs on to JobService" into nyc-dev 
am: 6827db3

* commit '6827db3e5fccb5185009ad5ac6a9e30d17573bf2':
  Fix issue #28075893: Don't hold strong refs on to JobService

Change-Id: I0112842918f713cbf30d061f82dcdfa4e8c084ca
 2016-04-09 00:40:37 +00:00
Andrii Kulian
d4b770e16e Merge "Fix multiple configuration changes in multiwindow" into nyc-dev 
am: 21400cb

* commit '21400cb552f5dc7f4c8296be53fabaa46b03fa85':
  Fix multiple configuration changes in multiwindow

Change-Id: I01db63f6b8899ad04fad72b759611a550b3b42ac
 2016-04-09 00:39:52 +00:00
Julia Reynolds
3898db9e15 Merge "Allow the ranker to autobundle notifications." into nyc-dev 2016-04-08 20:13:45 +00:00
Dianne Hackborn
6827db3e5f Merge "Fix issue #28075893: Don't hold strong refs on to JobService" into nyc-dev 2016-04-08 19:28:42 +00:00
Andrii Kulian
21400cb552 Merge "Fix multiple configuration changes in multiwindow" into nyc-dev 2016-04-08 19:05:20 +00:00
Andrii Kulian
701214b282 Fix multiple configuration changes in multiwindow 
When in split-screen mode and activity handles configuration changes
it gets 2 onConfigurationChanged calls which originate from
ActivityManagerService#updateConfigurationLocked:
1. app.thread.scheduleConfigurationChanged calls to all process records
   send configuration of the whole screen for corresponding orientation,
   which leads to CONFIGURATION_CHANGED message in ActivityThread.
2. mStackSupervisor.resizeStackLocked call resizes both visible stacks and
   eventually ActivityThread receives ACTIVITY_CONFIGURATION_CHANGED
   message with correct configuration corresponding to space occupied in
   split-screen.

In this CL if component callback is an instance of Activity and it had
override config set - onConfigurationChanged will not be triggered unless
override config has changed.

Bug: 27948331
Change-Id: Ia73b045570b44eb5b351811bf6c4f63d78c3f909
 2016-04-08 11:58:43 -07:00
Julia Reynolds
e46bb37acf Allow the ranker to autobundle notifications. 
Bug: 26709317
Change-Id: I5017a471604e513a7b582cdc2f3472441e108fae
 2016-04-08 13:55:03 -04:00
Amith Yamasani
d8d967e425 Improved javadoc for onLocalVoiceInteractionStopped 
Improved docs per API review: b/27365473

Change-Id: I8e2fd5291ecf3c41b4c1fa4df62b0dc69597c122
 2016-04-08 09:57:01 -07:00
Benjamin Franz
183ae07bd4 Merge "Throw security exception for non-parent aware APIs" into nyc-dev am: 5c1fbad 
am: 1acb890

* commit '1acb89035105ae0c4ec16cfab6f792ae1791e765':
  Throw security exception for non-parent aware APIs

Change-Id: I65709d7957570e97d5dcfcb81cc75fe3686129c4
 2016-04-08 12:12:45 +00:00
Benjamin Franz
1acb890351 Merge "Throw security exception for non-parent aware APIs" into nyc-dev 
am: 5c1fbad

* commit '5c1fbadb1a1169186b7a0a357ae9c35183258c6c':
  Throw security exception for non-parent aware APIs

Change-Id: Ibfddb4d0894644adec0ea5aa9e9c7e55431ce5be
 2016-04-08 12:08:47 +00:00
Benjamin Franz
5c1fbadb1a Merge "Throw security exception for non-parent aware APIs" into nyc-dev 2016-04-08 12:02:26 +00:00
Dianne Hackborn
0796e9fb3d Fix issue #28075893: Don't hold strong refs on to JobService 
Change-Id: I822adaee953be9b14213def001b174d5c348fa14
 2016-04-07 17:29:36 -07:00
Jorim Jaggi
f7ff639e26 Merge "Dismiss docked stack when opening non-resizable activity" into nyc-dev am: 7c3912e 
am: 220a909

* commit '220a9090ac24879c0a990d2a0eb0dac588e6166b':
  Dismiss docked stack when opening non-resizable activity

Change-Id: Ie0c301132353d45a3337e21303514780a2197e69
 2016-04-07 23:56:52 +00:00